]> CyberLeo.Net >> Repos - SourceForge/phpwiki.git/commit
oops, remove merge conflicts
authorrurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Sun, 27 Feb 2005 09:47:38 +0000 (09:47 +0000)
committerrurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Sun, 27 Feb 2005 09:47:38 +0000 (09:47 +0000)
commit8b202c1fde5d51cb9808148976c7bdc12feee64f
treeb92bb81070111c3a61b4636f08fb47432f06ea2b
parent92aece5e2a0381ec8445eab02b7a9d3e0ebb591e
oops, remove merge conflicts

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4605 96ab9672-09ca-45d6-a79d-3d69d39ca109
pgsrc/ReleaseNotes