fix: idunno what happened but git added this thingies on the code

e-graveyard · Oct 6, 2018 · 7862d23 · 7862d23
1 parent 5c4f780
commit 7862d23
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/dora.py b/src/dora.py
@@ -176,11 +176,7 @@ def respond(self, message, code, records=None):
 
         def success(self, records):
             return self.respond(
-<<<<<<< HEAD
                 'DNS lookup successfully made.', 200, records
-=======
-                'The DNS query was successful.', 200, records
->>>>>>> 6c8caf9c95de3728008841b9b80a87bbfd26ee61
             )
 
         @property