summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-16 20:04:51 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-16 20:04:51 +0000
commit85570b72064c60dd0bdd93b3b03d4597b872e342 (patch)
tree089bc34ada40fd828cf886c8a862b902be2630ce
parente100bc5d194cecda54895db452379a099e2b4f5e (diff)
web commit by http://nicholas.allen.myopenid.com/
-rw-r--r--doc/sandbox.mdwn2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index af357f4dc..81bbbdea7 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -109,5 +109,3 @@ Test.. I was looking for a wiki supporting OpenID~
----
me too...
-
-This is a test for conflict2 \ No newline at end of file