update pubspec

2 weeks ago · 8283f87df4
parent d3deaf4928
commit 8283f87df4
1 changed files with 1 additions and 4 deletions
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -46,9 +46,6 @@ workspace:
  - simplistic_editor
  - testing_app
  - tool
-<<<<<<< HEAD
-  - veggieseasons
-=======
->>>>>>> d5184b5647bb39913724dcd73f34bf85eb14d7d5
+
  - web_embedding/element_embedding_demo
  - web_embedding/ng-flutter/flutter