Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / todo / osm_arbitrary_layers.mdwn

diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 94cc27bb19c2fc15510aa98ae4abc298da0415a4..d59f394ee82a21fe55c565423cdb4e90458bd724 100644 (file)
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -37,3 +37,7 @@ I got tired of hacking at the osm.pm every time I wanted to change the layers, s
 >>>> Thanks for your time.  -- [[anarcat]]
 
 >>>>> I have implemented 1.b) and 2. (ie. it's a simple array now, and I split this stuff in different branches.) I'll open another todo for the other branches. --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]] 
+
+Confirmed, thanks!! --[[anarcat]]