update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_...

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b3eb52f078c8efcc5a3f6a5b488bf8d0d23630d3..e3b8412dfde15a142260040890e0854800e79713 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,14 @@
+###Is this a heading? 
+
+Sure it is. 
+
 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"]]
 
@@ -205,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
+
+test