Merge local.css into style.css.

1 files changed, 4 insertions, 1 deletions

diff --git a/local.scss b/style.scss
index 25a2209..b399835 100644
--- a/local.scss
+++ b/style.scss
@@ -1,4 +1,7 @@
-/* ikiwiki local style sheet */
+@import "compass/reset";
+@import "../shared/themes/default/ikiwiki";
+
+@include ikiwiki-style;
 
 BODY {
 	background-color: #84854c;