modified results.jade

rainysun · Dec 13, 2011 · d7ed526 · d7ed526
1 parent 578ea80
commit d7ed526
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/views/results.jade b/views/results.jade
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-h1= title
-p
-  = result.title
-  = result.press
-=======
 h1 Search Result:
 a(href='/') ->Back Home
 fieldset
@@ -29,4 +23,3 @@ fieldset
         td#{re.price}
         td#{re.total}
         td#{re.stock}
->>>>>>> mac