Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
-
2019-05-01 22:19:47 -06:00
parent 15449a84f8
commit 681a484e27
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
out/test/resources/test.properties
-1
View File
@@ -1 +0,0 @@
integration.test.base.url=http://localhost:
src/main/webapp/WEB-INF/jsp/index.jsp
+16 -9
View File
@@ -12,19 +12,26 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Pandamonium™ Theorem Prover</title> <title>Pandamonium™ Theorem Prover</title>
<link type="text/css" href="/css/bootstrap.css" rel="stylesheet" /> <link type="text/css" href="/css/bootstrap.css" rel="stylesheet" />
</head> </head>
<center> <center>
<div id="example1"> <div id="example1">
<h1>Theorem Prover</h1> <h1>Theorem Prover</h1>
<h2>Hello! Welcome to Pandamonium™ Theorem Prover!!</h2> <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>
</h4> Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page.
</h4>
</center> </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> </div>
</body> </body>