Merging big-feature into master.

jkgraham · May 31, 2012 · 180e96b · 180e96b
2 parents 6c0c788 + a6218f2
commit 180e96b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/somefolder/code.haml b/somefolder/code.haml
@@ -1,5 +1,6 @@
 :plain
   <!-- VIEWS: views\partials\_single_order.html.haml -->
+	<!-- Making a change in the same file, not on the same line -->
 - order = locals[:order]
 .span-24{:style => 'page-break-before: always;'}
   %h2