Fix leftover conflict marker in UPGRADE-3.0.md

guilliamxavier · guilliamxavier · commit b47220aaa4e2 · 2016-03-14T22:24:56.000+01:00
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -403,7 +403,6 @@ UPGRADE FROM 2.x to 3.0
 
  * The `choice_list` option of `ChoiceType` was removed.
 
->>>>>>> 2.8
  * The option "precision" was renamed to "scale".
 
    Before:
