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)
modules/freifunk/htdocs/cgi-bin-nodes.html [deleted file]

diff --git a/modules/freifunk/htdocs/cgi-bin-nodes.html b/modules/freifunk/htdocs/cgi-bin-nodes.html
deleted file mode 100644 (file)
index d409a7c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="refresh" content="0; URL=/luci/olsr" />
-</head>
-<body style="background-color: black">
-<a style="color: white; text-decoration: none" href="/luci/olsr">LuCI - Lua Configuration Interface</a>
-</body>
-</html>