resolve conflicts

creative-commoners · Nov 8, 2015 · 397ba43 · 397ba43
1 parent e860730
commit 397ba43
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/code/models/ElementalArea.php b/code/models/ElementalArea.php
@@ -10,14 +10,8 @@ public function Elements() {
 
 		$list = new HasManyList('BaseElement', $result->getForeignKey());
 		$list->setDataModel($this->model);
-<<<<<<< HEAD
 		$list->sort('Sort ASC');
 
-=======
-		$list = $list->filter('Enabled', 1);
-		$list = $list->sort('Sort ASC');
-
->>>>>>> cc1bacfcf799bd97344a8219f8850b3a15cce8f7
 		$list = $list->forForeignID($this->ID);
 
 		return $list;