Permalink
Browse files

corrected merge problem for #6

  • Loading branch information...
1 parent ef15d3b commit d7247ef37b87effe0dc99859ed0561131b285756 @gigasquid committed Jan 6, 2012
Showing with 0 additions and 13 deletions.
  1. +0 −13 src/refheap/views/common.clj
@@ -42,19 +42,6 @@
(defn layout [& content]
(ph/html5
- [:head
- [:title "RefHeap"]
- [:link {:rel "shortcut icon" :href "/img/favicon.ico"}]
- (ph/include-css "http://fonts.googleapis.com/css?family=Open+Sans")
- (ph/include-css "/css/refheap.css")
- (ph/include-css "/css/native.css")
- (ph/include-js "/js/jquery-1.7.1.min.js")
- (ph/include-js "https://browserid.org/include.js")
- (ph/include-js "/js/refheap.js")
- (analytics)])
-
-(defn layout [& content]
- (ph/html5
(header)
[:body
[:div#site-container

0 comments on commit d7247ef

Please sign in to comment.