Fixed accidental conflict messge

cogiton · cogiton · commit f64789012735 · 2022-04-06T21:34:28.000-07:00
diff --git a/README.md b/README.md
@@ -40,10 +40,7 @@ of the `.frm` file that was used to generate the state machine.
 ### Frame v0.7.4
 
 Frame now supports golang!
-<<<<<<< HEAD
-=======
 
->>>>>>> main
 
 ## Resources
 
