From 8283f87df47e3e28ad0199cdcf21d2f8804a476c Mon Sep 17 00:00:00 2001
From: Eric Windmill <eric@ericwindmill.com>
Date: Thu, 21 Aug 2025 10:53:37 -0700
Subject: [PATCH] update pubspec

---
 pubspec.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 882c04866..a58e057ba 100644
--- 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