From cb70200a38ffc3e6f423939246f5c0ef3e1f390f Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Mon, 25 Jun 2018 19:46:39 +0530
Subject: [PATCH] Remove conflict markers and resolve conflict

---
 debian/patches/fix-8-to-10-migration.patch | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/patches/fix-8-to-10-migration.patch b/debian/patches/fix-8-to-10-migration.patch
index 695792be03..837780061c 100644
--- a/debian/patches/fix-8-to-10-migration.patch
+++ b/debian/patches/fix-8-to-10-migration.patch
@@ -13,11 +13,7 @@ index 0abae70c443..e4ff8261120 100644
 +      # If the features table does not exist, don't check the feature, just return
 +      # the default
 +      unless Feature::FlipperFeature.table_exists?
-<<<<<<< HEAD
-+        return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
-=======
 +        return false
->>>>>>> master
 +      end
 +
        feature = Feature.get("gitaly_#{feature_name}")