From cd9d9ad50b20b3ad3cb7c5e8f4eda224a2cd63c1 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathan.d.turner@gmail.com>
Date: Wed, 27 Nov 2019 15:07:55 +1300
Subject: [PATCH] improve duration print

---
 tests/filter_str_tests.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/filter_str_tests.rs b/tests/filter_str_tests.rs
index 5c133f8b77..fde3c77ee0 100644
--- a/tests/filter_str_tests.rs
+++ b/tests/filter_str_tests.rs
@@ -131,11 +131,7 @@ fn find_and_replaces() {
             cwd: dirs.test(), h::pipeline(
             r#"
                  open sample.toml
-<<<<<<< HEAD
                  | str fortune.teller.phone --find-replace [KATZ "5289"]
-=======
-                 | str fortune.teller.phone --find-replace [KATZ 5289]
->>>>>>> 8cedd2e... replace and find-replace str plugin additions.
                  | get fortune.teller.phone
                  | echo $it
              "#
@@ -161,11 +157,7 @@ fn find_and_replaces_without_passing_field() {
             r#"
                  open sample.toml
                  | get fortune.teller.phone
-<<<<<<< HEAD
                  | str --find-replace [KATZ "5289"]
-=======
-                 | str --find-replace [KATZ 5289]
->>>>>>> 8cedd2e... replace and find-replace str plugin additions.
                  | echo $it
              "#
         ));