chore: resolve package json conflict

Signed-off-by: Jeremy Andrews <[email protected]>
open-feature · Dec 12, 2024 · ea38212 · ea38212
1 parent cab33e8
commit ea38212
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/open-feature-dart-server-sdk/.dart_tool/package_config.json b/open-feature-dart-server-sdk/.dart_tool/package_config.json
@@ -362,15 +362,8 @@
       "languageVersion": "3.5"
     }
   ],
-<<<<<<< HEAD
+
   "generated": "2024-12-12T13:52:36.316776Z",
-=======
-<<<<<<< HEAD
-  "generated": "2024-12-12T13:34:40.670015Z",
-=======
-  "generated": "2024-12-12T13:32:41.664278Z",
->>>>>>> e8375be (chore: add lock and pubspec)
->>>>>>> 252a9d5 (chore: resolve package json conflict)
   "generator": "pub",
   "generatorVersion": "3.6.0",
   "pubCache": "file:///C:/Users/preth/AppData/Local/Pub/Cache"