Browse files

resolve merge error

  • Loading branch information...
2 parents 606c6dd + f3abaa3 commit cebf1f863c351fac8951f5d63e0060e4b348b4c7 @pkrumins committed Jan 4, 2013
Showing with 5 additions and 1 deletion.
  1. +1 −1 package.json
  2. +4 −0 static/style.css
View
2 package.json
@@ -17,7 +17,7 @@
"github-from-package" : "~0.0.0",
"mkdirp" : "~0.3.4",
"request": "~2.12.0",
- "through": "~2.1.0"
+ "through" : "~2.1.0"
},
"devDependencies" : {
"browserify" : "~1.16.6"
View
4 static/style.css
@@ -53,6 +53,10 @@ body {
color: rgb(230,182,91);
}
+#search {
+ display: none;
+}
+
#search .box {
max-width: 694px;
margin: auto;

0 comments on commit cebf1f8

Please sign in to comment.