diff --git a/.gitignore b/.gitignore index e88ce73..df7bc05 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ +<<<<<<< HEAD __pycache__/hello.cpython-36.pyc +======= + +>>>>>>> 1d65f57b16fbe60821690c0ff92fd6535e64f1e7 diff --git a/__pycache__/hello.cpython-36.pyc b/__pycache__/hello.cpython-36.pyc deleted file mode 100644 index 112e7ab..0000000 Binary files a/__pycache__/hello.cpython-36.pyc and /dev/null differ diff --git a/static/images/test1.jpeg b/static/images/test1.jpeg new file mode 100644 index 0000000..20aaad4 Binary files /dev/null and b/static/images/test1.jpeg differ diff --git a/static/images/test2.jpeg b/static/images/test2.jpeg new file mode 100644 index 0000000..ebf7db2 Binary files /dev/null and b/static/images/test2.jpeg differ diff --git a/static/images/test3.jpeg b/static/images/test3.jpeg new file mode 100644 index 0000000..175bf28 Binary files /dev/null and b/static/images/test3.jpeg differ diff --git a/templates/perspectiveB.html b/templates/perspectiveB.html index db218c1..ba148d8 100644 --- a/templates/perspectiveB.html +++ b/templates/perspectiveB.html @@ -6,12 +6,8 @@ } -Hello from Flask -{% if name %} -

Hello {{ name }}!

-{% else %} -

VVVW

-{% endif %} +PerspectiveB +

VVVW - PerspectiveB