fix: merge conflicts

gluestack · Jan 11, 2024 · 5caf293 · 5caf293
1 parent 5030926
commit 5caf293
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md
@@ -1,7 +1,5 @@
 # @gluestack-style/react
 
-<<<<<<< HEAD
-
 ## 1.0.37
 
 ### Patch Changes
@@ -12,8 +10,7 @@
 
 ### Patch Changes
 
-- - Fixed data theme id attribute
-    > > > > > > > 2a5d53586a16cd5db916bb95a3ecba1730d131e2
+- Fixed data theme id attribute
 
 ## 1.0.35