mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Work around bazaar merges not liking conflicts.
This commit is contained in:
parent
8fa329cfe2
commit
6eb246a811
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
||||
*~
|
502
LICENSE.wine-compholio
Normal file
502
LICENSE.wine-compholio
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user