Minor bugfix for missed merge conflict...

mckeownp · Mar 5, 2024 · 51a458d · 51a458d
1 parent 8902d3e
commit 51a458d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/classes/jobesandbox.php b/classes/jobesandbox.php
@@ -74,12 +74,9 @@ public function __construct() {
         global $CFG;
         qtype_coderunner_sandbox::__construct();
         $this->jobeserver = get_config('qtype_coderunner', 'jobe_host');
-<<<<<<< HEAD
         if ($this->jobeserver === 'jobe2.cosc.canterbury.ac.nz') {
             throw new Exception("PLease don't use the Canterbury jobe server for test runs");
         }
-=======
->>>>>>> grade_cache_for_merging
         $this->apikey = get_config('qtype_coderunner', 'jobe_apikey');
         $this->languages = null;
     }