[nautilus] tests: Remove git conflict indicator from build file

[Ernestas Kulik <ernestask src gnome org>]

commit 609bf585fe7b9e606fb2b81f021ae22b5354b612
Author: Ernestas Kulik <ernestask gnome org>
Date:   Thu Jul 19 13:23:21 2018 +0300

    tests: Remove git conflict indicator from build file
    
    Oops.

 test/automated/displayless/meson.build | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
index 8a4800ffd..6951c73af 100644
--- a/test/automated/displayless/meson.build
+++ b/test/automated/displayless/meson.build
@@ -17,7 +17,6 @@ tests = [
   ['test-nautilus-search-engine', [
     'test-nautilus-search-engine.c'
   ]],
->>>>>>> tests: Use GMainLoop in search engine test
 ]
 
 foreach t: tests