fix merge conflicts

Signed-off-by: Arthur Lu <learthurgo@gmail.com>

static/reset.css

@@ -58,25 +58,25 @@ table {
 }
 
 input, select {
-  vertical-align :middle;
+  vertical-align: middle;
 }
 
 img, fieldset, object {
-  border:none;
+  border: none;
 }
 
 *, *:after, *:before {
-  box-sizing:border-box;
+  box-sizing: border-box;
 }
 
 button, label {
-  cursor:pointer;
+  cursor: pointer;
 }
 
 html, body {
-  height:100%;
+  height: 100%;
 }
 
 form {
-  border
+  border: solid;
 }