]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/Makefile.am
projects / netatalk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f1c0e46) | patch
Fix merge conflict resolution error
authorFrank Lahm <franklahm@googlemail.com>
Sat, 18 Jun 2011 05:56:17 +0000 (07:56 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 18 Jun 2011 05:56:17 +0000 (07:56 +0200)
commit3969c94735f50f4f625e477c17e680836e77c053
treecb54c07755a954ca42796625c1ad6547e00571d8tree | snapshot
parentf1c0e462cdfe8d19a14bb4e296ed005e3f14bd56commit | diff
Fix merge conflict resolution error
etc/afpd/Makefile.am diff | blob | history
Alex' Netatalk development repository