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

Revert "FIx the merge conflict by a patch"

Browse source 
This reverts commit 33cece4870.
This commit is contained in:
Pirate Praveen 2021-02-01 13:18:56 +05:30
parent 1ba4a2d0dc
commit 40dd71157d
2 changed files with 0 additions and 2303 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
View file

File diff suppressed because it is too large Load diff

1
debian/patches/series vendored
View file

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