Resolving conflicts

thewchan · Jun 25, 2020 · 736756a · 736756a
2 parents 45350d2 + ff0444a
commit 736756a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app.py b/app.py
@@ -8,7 +8,11 @@
 @app.route('/', methods=('GET', 'POST'))
 def index():
     """Render the app's main page."""
+<<<<<<< HEAD
     if request.method == 'GET':
+=======
+    if request.methods == 'GET':
+>>>>>>> ff0444aa864f91688c632ff0f143c4d5ae6e6317
         # Default gives IBM's ticker when first loaded.
         symbol = 'IBM'
         return render_template('index.html', symbol=symbol)