Resolve a conflict
authorSteven Barth <steven@midlink.org>
Mon, 15 Sep 2008 23:19:11 +0000 (23:19 +0000)
committerSteven Barth <steven@midlink.org>
Mon, 15 Sep 2008 23:19:11 +0000 (23:19 +0000)
commite10d64e3e09dee27d1ddf35ba3efaf8bddb8729b
treed5ed40610914951a5490c5dda3efc7901a0f16ca
parentb0d49454a691445e73016df56bb3800a13679005
Resolve a conflict
modules/freifunk/htdocs/cgi-bin-nodes.html [deleted file]