]> arthur.barton.de Git - netatalk.git/commit
Previos merge from 2-0 did still contain a conflict marker
authorfranklahm <franklahm>
Wed, 9 Sep 2009 11:52:26 +0000 (11:52 +0000)
committerfranklahm <franklahm>
Wed, 9 Sep 2009 11:52:26 +0000 (11:52 +0000)
commit83af771c91ee92f69c11110f063dc5c1b93c8d31
treec3258e162da60a078c382b016549b7465fecbbdd
parent65065ac4aedfa6ab767377c5248678d8e9ec928f
Previos merge from 2-0 did still contain a conflict marker
distrib/initscripts/Makefile.am