blah

4 years ago · 6a33c9149a
6 changed files with 6 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,5 @@
+<<<<<<< HEAD
 __pycache__/hello.cpython-36.pyc
+=======
+
+>>>>>>> 1d65f57b16fbe60821690c0ff92fd6535e64f1e7
--- a/pycache/hello.cpython-36.pyc
+++ b/pycache/hello.cpython-36.pyc
--- a/static/images/test1.jpeg
+++ b/static/images/test1.jpeg
--- a/static/images/test2.jpeg
+++ b/static/images/test2.jpeg
--- a/static/images/test3.jpeg
+++ b/static/images/test3.jpeg
--- a/templates/perspectiveB.html
+++ b/templates/perspectiveB.html
@ -6,12 +6,8 @@
 }
 </style>
 <head>
-<title>Hello from Flask</title>
-{% if name %}
-  <h1>Hello {{ name }}!</h1>
-{% else %}
-  <h1>VVVW</h1>
-{% endif %}
+<title>PerspectiveB</title>
+<h1>VVVW - PerspectiveB</h1>
 </head>

 <body>