core-jgi/dir_conflicts.prej

7 lines
114 B
Plaintext
Raw Normal View History

2006-11-23 22:38:55 +07:00
Trying to delete property 'svn:ignore' but value has been modified from '
keystore
bin
' to 'keystore
bin
build
'.