2016-03-13 15:36:13 -04:00 · 2016-03-13 15:36:13 -04:00 · 40dbcaebf2
parent befcb09e8f
commit 40dbcaebf2
1 changed files with 4 additions and 0 deletions
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@ -1,6 +1,10 @@
 Nope my friend.

+<<<<<<< HEAD
 [[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100

 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]