diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-19 13:23:21 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-07-19 13:23:21 +0300 |
| commit | 609bf585fe7b9e606fb2b81f021ae22b5354b612 (patch) | |
| tree | 8226208ed56d67307df39bf31e1d3df2ed15bcaa /test | |
| parent | 2f8e300d3d50244af8c64fe12c558de4794d912b (diff) | |
| download | nautilus-609bf585fe7b9e606fb2b81f021ae22b5354b612.tar.gz | |
tests: Remove git conflict indicator from build file
Oops.
Diffstat (limited to 'test')
| -rw-r--r-- | test/automated/displayless/meson.build | 1 |
1 files changed, 0 insertions, 1 deletions
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 |