From 681a484e275326f4e413282a2cc1c8cf6d1d8677 Mon Sep 17 00:00:00 2001 From: - <-> Date: Wed, 1 May 2019 22:19:47 -0600 Subject: [PATCH] fixed conflict --- out/test/resources/test.properties | 1 - src/main/webapp/WEB-INF/jsp/index.jsp | 25 ++++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 out/test/resources/test.properties diff --git a/out/test/resources/test.properties b/out/test/resources/test.properties deleted file mode 100644 index 9bc08c6..0000000 --- a/out/test/resources/test.properties +++ /dev/null @@ -1 +0,0 @@ -integration.test.base.url=http://localhost: \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index fc13988..c87e887 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -12,19 +12,26 @@ - - Pandamonium™ Theorem Prover - + + Pandamonium™ Theorem Prover +
-
-

Theorem Prover

-

Hello! Welcome to Pandamonium™ Theorem Prover!!

-

- Click on this link to visit theorem entering page. -

+
+

Theorem Prover

+

Hello! Welcome to Pandamonium™ Theorem Prover!!

+ +

+ Click on this link to visit theorem entering page. +

+ + +Click on this link to visit theorem entering page. +

Sign In

+ +