From c59927b378092f437896381698ebc8d4a4243492 Mon Sep 17 00:00:00 2001 From: Scott Ostler Date: Mon, 21 Dec 2009 23:49:18 -0500 Subject: Pushing --- static/index.html | 234 +++++++++--------------------------------------------- 1 file changed, 38 insertions(+), 196 deletions(-) (limited to 'static/index.html') diff --git a/static/index.html b/static/index.html index 82e9eb4..4615d9f 100755 --- a/static/index.html +++ b/static/index.html @@ -1,23 +1,17 @@ -<<<<<<< HEAD:static/index.html - - - -======= - - ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html + - + -<<<<<<< HEAD:static/index.html dump.fm + + - - - -
-
+--> + -
-
-


-

-
-
-

-
+ +
+
+
+
+


+

+ +
+

+
+
-


+


 

@@ -362,10 +202,16 @@ body {

 


u - +
p - +


@@ -373,23 +219,19 @@ body {

 

 

- +

- + - - + +
-<<<<<<< HEAD:static/index.html - -======= - ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html + \ No newline at end of file -- cgit v1.2.3-70-g09d2