fix merging

algolia · Aug 6, 2015 · 430e732 · 430e732
1 parent a213558
commit 430e732
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/Indexer/Indexer.php b/Indexer/Indexer.php
@@ -35,19 +35,13 @@ class Indexer
     // 'entity' => $someEntity,
     // 'indexName' => 'index name to override where the entity should normally go'
     // ]
-<<<<<<< HEAD
-    protected $entitiesScheduledForCreation = array();
-
+
     // holds arrays like ['entity' => $entity, 'changeSet' => $changeSet]
-    protected $entitiesScheduledForUpdate = array();
-
-=======
-    private $entitiesScheduledForCreation = array();
+    protected $entitiesScheduledForCreation = array();
 
     // holds arrays like ['entity' => $entity, 'changeSet' => $changeSet]
-    private $entitiesScheduledForUpdate = array();
+    protected $entitiesScheduledForUpdate = array();
 
->>>>>>> 157a0a3136dfd468a20c31901f5aeb969799c577
     // holds arrays like ['objectID' => 'aStringID', 'index' => 'anIndexName']
     protected $entitiesScheduledForDeletion = array();