diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-15 23:19:11 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-15 23:19:11 +0000 |
| commit | e10d64e3e09dee27d1ddf35ba3efaf8bddb8729b (patch) | |
| tree | d5ed40610914951a5490c5dda3efc7901a0f16ca | |
| parent | b0d49454a691445e73016df56bb3800a13679005 (diff) | |
Resolve a conflict
| -rw-r--r-- | modules/freifunk/htdocs/cgi-bin-nodes.html | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/modules/freifunk/htdocs/cgi-bin-nodes.html b/modules/freifunk/htdocs/cgi-bin-nodes.html deleted file mode 100644 index d409a7cb67..0000000000 --- a/modules/freifunk/htdocs/cgi-bin-nodes.html +++ /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> |