aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-25 10:13:04 -0400
committerJoey Hess <joey@kitenet.net>2012-08-25 10:13:22 -0400
commit93a12752ace90080fc62f4ea030a74f844ad09c8 (patch)
tree8250c9fff650e0582bc3e8d6512623b44d315531 /doc
parentcd755cacc67da2cadb30b3e76848057a51b3923a (diff)
downloadikiwiki-93a12752ace90080fc62f4ea030a74f844ad09c8.tar
ikiwiki-93a12752ace90080fc62f4ea030a74f844ad09c8.tar.gz
merged anarcat/osm_arbitrary_layers
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/osm_arbitrary_layers.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 94cc27bb1..4e579b54a 100644
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -37,3 +37,5 @@ 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]]