realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove conflict markers and resolve conflict

Browse source
This commit is contained in:
Pirate Praveen 2018-06-25 19:46:39 +05:30
parent 794e6f8547
commit cb70200a38
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/patches/fix-8-to-10-migration.patch vendored
View file

@ -13,11 +13,7 @@ index 0abae70c443..e4ff8261120 100644
+ # If the features table does not exist, don't check the feature, just return + # If the features table does not exist, don't check the feature, just return
+ # the default + # the default
+ unless Feature::FlipperFeature.table_exists? + unless Feature::FlipperFeature.table_exists?
<<<<<<< HEAD
+ return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
=======
+ return false + return false
>>>>>>> master
+ end + end
+ +
feature = Feature.get("gitaly_#{feature_name}") feature = Feature.get("gitaly_#{feature_name}")