Fixed conflict with .bzrignore
This commit is contained in:
parent
e051495715
commit
f9f0fb3752
@ -2,4 +2,6 @@
|
||||
*.sw?
|
||||
doc/build/*
|
||||
dist
|
||||
ChangeLog
|
||||
.coverage
|
||||
swift.egg-info
|
||||
|
Loading…
x
Reference in New Issue
Block a user