]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
projects / git.ikiwiki.info.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f38ad99) | patch
remove conflict marker
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 19:58:17 +0000 (14:58 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 19:58:17 +0000 (14:58 -0500)
commit7fc96e5a2a4ee1301a7ca4636479261d707c84c8
tree63f903376aecd95382a016a9fe538f1576782f88tree | snapshot
parentf38ad993b4b5f293ec691e0d3182e761791ee273commit | diff
remove conflict marker
doc/plugins/htmlscrubber.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.