Work around bazaar merges not liking conflicts.

This commit is contained in:
Erich E. Hoover 2013-11-23 17:00:04 -07:00
parent 8fa329cfe2
commit 6eb246a811
2 changed files with 502 additions and 1 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
*~

502
LICENSE.wine-compholio Normal file

File diff suppressed because it is too large Load Diff