From 33a4e4940113cd70d37bde3be7049b624603aa68 Mon Sep 17 00:00:00 2001 From: Matan Rak Date: Wed, 17 May 2017 10:06:52 +0300 Subject: [PATCH] Removing old index.html page --- app/index.html | 136 +++++++++++++++++++++++++++++++++++ app/indexNEW.html | 180 ---------------------------------------------- 2 files changed, 136 insertions(+), 180 deletions(-) delete mode 100755 app/indexNEW.html diff --git a/app/index.html b/app/index.html index 5bb3f1c..b2074ac 100644 --- a/app/index.html +++ b/app/index.html @@ -1,3 +1,138 @@ +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+ + + +
+ +
+ +

Email

+ + +

Password

+ + +
+ +
+ +
+ +
+ + + +
+
+ +
+ +

Post title

+ +

Posted by: PERSON 23.4.17

+ + 
    Hello WesterosCraft Builders and Honored Guests! As you know, 
+                            progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and 
+                            are calling all builders to the capital! 
+                            There has been a lot of progress with Kingslanding planning and we are happy to...
+
+ +
+ +
+
+ +
+ + + + + + + + + + + + + +=======  @@ -42,3 +177,4 @@ +>>>>>>> refs/remotes/origin/master diff --git a/app/indexNEW.html b/app/indexNEW.html deleted file mode 100755 index 19cd8eb..0000000 --- a/app/indexNEW.html +++ /dev/null @@ -1,180 +0,0 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- -
- -
- - -
-
- -
- -
- -
- - - -
- -
- -

Email

- - -

Password

- - -
- -
- -
- -
- - - -
-
- -
- -

Post title

- -

Posted by: PERSON 23.4.17

- - 
    Hello WesterosCraft Builders and Honored Guests! As you know, 
-                            progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and 
-                            are calling all builders to the capital! 
-                            There has been a lot of progress with Kingslanding planning and we are happy to...
-
- -
- -
-
- -
- - - - - - - - - - - - - -======= - - - - - - Westeroscraft Launcher - - - - -
-
- -
-
- -
- -
-
- -
-
-
-
-
-
-
-
-
-
-
- - ->>>>>>> refs/remotes/origin/master