admin-merge: fix merge conflict detection
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 04:17:10 +0000 (06:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 04:17:10 +0000 (06:17 +0200)
commit1432395f150af755edafa1119b2f5f1e0b4aebaf
tree789fa7cf28b184acd3383cc6bc112cdc41974c51
parent19b34c1c8a68c618595b11567e72b8f1d263cc86
admin-merge: fix merge conflict detection
all