Merge conflicts in stalls.html

canteeneo/templates/stalls.html

@@ -19,12 +19,7 @@
                     </div>
                     <div class="dashboard-row">
                         <a href="{{ url_for('stall', stall_id=stall.id) }}"><button class="list-button">Manage Stall</button></a>
-<<<<<<< HEAD
-                        <form action="{{ url_for('stall', stall_id=stall.id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete {{stall.name}}?');">
-                            <input type="hidden" name="_method" value="DELETE" />
-=======
                         <form action="{{ url_for('delete_stall', stall_id=stall.id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete {{stall.name}}?');">
->>>>>>> parent of 7615415... Implement stall methods in a MethodView
                             <button type="submit" class="list-button button-delete">Delete</button>
                         </form>
                     </div>