From 5847ad3c814059c42f0f6b36ba34bddca164e86b Mon Sep 17 00:00:00 2001
From: Vlad <stegaru.vlad@gmail.com>
Date: Tue, 20 Mar 2018 14:58:22 +0200
Subject: [PATCH] feat(automation): remove conflicts

---
 automation/Object Repository/NewUser/addUser.rs     | 3 ---
 automation/Object Repository/NewUser/adminButton.rs | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/automation/Object Repository/NewUser/addUser.rs b/automation/Object Repository/NewUser/addUser.rs
index 842a68299..a33b23499 100644
--- a/automation/Object Repository/NewUser/addUser.rs	
+++ b/automation/Object Repository/NewUser/addUser.rs	
@@ -6,20 +6,17 @@
    <elementGuidId>603be35e-a2f1-4b42-9155-c50663f2f154</elementGuidId>
    <selectorCollection>
       <entry>
-<<<<<<< HEAD
          <key>CSS</key>
          <value>button[data-test=&quot;button-add-user&quot;]</value>
       </entry>
       <entry>
          <key>XPATH</key>
-=======
          <key>XPATH</key>
          <value>//button/*[1]</value>
       </entry>
       <entry>
          <key>CSS</key>
          <value>button:first-child</value>
->>>>>>> e85cabdf8bb80ea1284bf832b47b990be81d0c03
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>
diff --git a/automation/Object Repository/NewUser/adminButton.rs b/automation/Object Repository/NewUser/adminButton.rs
index 01b317e00..196272563 100644
--- a/automation/Object Repository/NewUser/adminButton.rs	
+++ b/automation/Object Repository/NewUser/adminButton.rs	
@@ -6,19 +6,16 @@
    <elementGuidId>9be9ae36-fc08-41ea-9e5e-66e6b3424324</elementGuidId>
    <selectorCollection>
       <entry>
-<<<<<<< HEAD:automation/Object Repository/NewUser/adminButton.rs
          <key>CSS</key>
       </entry>
       <entry>
          <key>XPATH</key>
          <value>//*[@id=&quot;root&quot;]/div/div/div[1]/div[2]/div/span[2]</value>
-=======
          <key>XPATH</key>
          <value>//span[contains(text(),'admin')]</value>
       </entry>
       <entry>
          <key>CSS</key>
->>>>>>> e85cabdf8bb80ea1284bf832b47b990be81d0c03:automation/Object Repository/NewUser/admin.rs
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>
-- 
GitLab