diff --git a/pubspec.lock b/pubspec.lock
index bb7134f..b145f14 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -273,7 +273,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.4"
->>>>>>> master
   diff_match_patch:
     dependency: transitive
     description: