fix for linux

2026-06-05 16:42:29 +03:00 · 2011-12-24 22:31:39 -08:00
parent 04fee21121
commit 076370f3f9
2 changed files with 2 additions and 7 deletions
@@ -6,11 +6,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Designed and built with all the love in the world @twitter by @mdo and @fat.
-<<<<<<< HEAD
- * Date: Thu Dec 22 19:09:49 PST 2011
-=======
- * Date: Wed Dec 21 18:38:56 CST 2011
->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c
+ * Date: Sat Dec 24 22:30:43 PST 2011
 */
 html, body {
  margin: 0;