Добавление Мест размещения и регионов (подразделений)

diff --git a/models/ItemsSearch.php b/models/ItemsSearch.php
index 247ee3c..0cb4ad4 100644 (file)
--- a/models/ItemsSearch.php
+++ b/models/ItemsSearch.php
@@ -47,11 +47,8 @@ class ItemsSearch extends Items
         $query = Items::find();
         $query->joinWith(['status']);
         $query->joinWith(['types']);
-<<<<<<< HEAD
-=======
         $query->joinWith(['locations']);
 //        $query->joinWith(['regions']);
->>>>>>> develop
 
         // add conditions that should always apply here