From 0791c9994507bde2ec3746ba87f7de0208c71d01 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 9 Sep 2015 20:47:46 -0700
Subject: [PATCH] remove commit garbage

---
 server/views/coursewares/showZiplineOrBasejump.jade | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 2b565d9235..2421adf256 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -22,7 +22,6 @@ block content
                     var userLoggedIn = true;
             else
                 a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
-<<<<<<< HEAD
             .button-spacer
             .btn-group.input-group.btn-group-justified
                 .btn.btn-success.btn-big#trigger-help-modal
@@ -36,8 +35,6 @@ block content
                         | &nbsp; Bug
             if (!user)
                 .button-spacer
-=======
->>>>>>> staging
                 a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
                     script.
                         var userLoggedIn = false;