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

FIx the merge conflict by a patch

Browse source
This commit is contained in:
Pirate Praveen 2021-01-30 21:45:13 +05:30
parent 5017262b02
commit 33cece4870
2 changed files with 2303 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2302
debian/patches/fix-mismatch-by-manual-merge.patch vendored Normal file
View file

File diff suppressed because it is too large Load diff

1
debian/patches/series vendored
View file

@ -30,3 +30,4 @@
0740-use-packaged-modules.patch
0750-fix-relative-paths.patch
0770-remove-capybara-screenshot-rspec.patch
fix-mismatch-by-manual-merge.patch