dummy commit, testing stash conflict removal

k-anderson · k-anderson · commit 1f20ab4a56c2 · 2011-01-04T16:22:37.000-05:00
diff --git a/xml.php b/xml.php
@@ -3,5 +3,3 @@
 define('CONTENT_TYPE', 'xml');
 
 include('index.php');
-
-
