From 81d21cdca48056039d9df0ec665fed53def6a5ff Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 30 Oct 2019 12:43:35 -0700 Subject: [PATCH] Fixing formatting --- libbeat/tests/system/test_monitoring.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libbeat/tests/system/test_monitoring.py b/libbeat/tests/system/test_monitoring.py index 25f5df647c0..73767e24c7c 100644 --- 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))