Fixing formatting

elastic · Nov 19, 2019 · 81d21cd · 81d21cd
1 parent f91ca8a
commit 81d21cd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/libbeat/tests/system/test_monitoring.py b/libbeat/tests/system/test_monitoring.py
@@ -272,10 +272,6 @@ def get_beat_state(self):
         url = "http://localhost:5066/state"
         return requests.get(url).json()
 
-<<<<<<< HEAD
-=======
-
->>>>>>> Adding system test
     def random_string(self, size):
         char_pool = string.ascii_letters + string.digits
         return ''.join(random.choice(char_pool) for i in range(size))