Resolving merge.

jefftriplett · jefftriplett · commit 6b351a1d34b8 · 2011-08-13T12:33:07.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .gondor
-pythonkc.kpf
 *.pyc
 pythonkc_site/pythonkc.sqlite
diff --git a/pythonkc_site/media/screen.css b/pythonkc_site/media/screen.css
@@ -0,0 +1,2 @@
+RESET
+-----------

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 .gondor
 -pythonkc.kpf
 *.pyc
 pythonkc_site/pythonkc.sqlite