From b47220aaa4e267c6164c5165867c5c7db500eb16 Mon Sep 17 00:00:00 2001
From: Guilliam Xavier <guilliamxavier@users.noreply.github.com>
Date: Mon, 14 Mar 2016 22:24:56 +0100
Subject: [PATCH] Fix leftover conflict marker in UPGRADE-3.0.md

---
 UPGRADE-3.0.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 96778e36ee..8925b91189 100644
--- 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: