deleted mangling caused by merge

marcusgreen · Jan 1, 2016 · ca240e5 · ca240e5
1 parent 8dcf73e
commit ca240e5
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/questiontype.php b/questiontype.php
@@ -98,11 +98,8 @@ public function find_standard_scripts() {
             $jquery = '/question/type/' . $this->name().'/jquery';
             $PAGE->requires->js($jquery.'/jquery-1.9.1.min.js', true);
             $PAGE->requires->js($jquery.'/jquery-ui-1.11.4.min.js', true);
-<<<<<<< HEAD
-           // $PAGE->requires->js($jquery.'/jquery-ui.touch-punch.js', true);
-=======
             $PAGE->requires->js($jquery.'/jquery-ui.touch-punch.js', true);
->>>>>>> b45278abea3db7145fbc90e5b7a29e92bd5ce14b
+
         }
     }