From 430e732806a89a00f9430afb45b2b24ba886374f Mon Sep 17 00:00:00 2001
From: Maxime Locqueville <maxiloc@gmail.com>
Date: Thu, 6 Aug 2015 09:49:11 +0200
Subject: [PATCH] fix merging

---
 Indexer/Indexer.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Indexer/Indexer.php b/Indexer/Indexer.php
index e16d6dd1..40fe31cd 100644
--- 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();