fixed conflict

2019-05-01 22:19:47 -06:00
parent 15449a84f8
commit 681a484e27
2 changed files with 16 additions and 10 deletions
@@ -1 +0,0 @@
-integration.test.base.url=http://localhost:
@@ -21,10 +21,17 @@
    <div id="example1">
        <h1>Theorem Prover</h1>
        <h2>Hello! Welcome to Pandamonium™ Theorem Prover!!</h2>
+
        <h4>
            Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page.
        </h4>
 </center>
+
+
+Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page.
+<h4 class="text-center"><a href="/login">Sign In</a></h4>
+</div>
+
 </div>
 </body>
				`@@ -1 +0,0 @@`
				`integration.test.base.url=http://localhost:`