remove conflict markers
authorAndrew Garrett <werdna@users.mediawiki.org>
Tue, 7 Jul 2009 14:32:52 +0000 (14:32 +0000)
committerAndrew Garrett <werdna@users.mediawiki.org>
Tue, 7 Jul 2009 14:32:52 +0000 (14:32 +0000)
commit23a9f934a97126896f89a94b95d0d7ae0d910141
treed7af510f3436fddc2fa6a4f3e23cd65253ebb4e6
parent717af5aaea2cb81d13568fd2cc315d795caf4768
remove conflict markers
docs/hooks.txt