summaryrefslogtreecommitdiff
path: root/hacklabxl.css
diff options
context:
space:
mode:
Diffstat (limited to 'hacklabxl.css')
-rw-r--r--hacklabxl.css5
1 files changed, 5 insertions, 0 deletions
diff --git a/hacklabxl.css b/hacklabxl.css
index d5f3dab..e0361af 100644
--- a/hacklabxl.css
+++ b/hacklabxl.css
@@ -1,5 +1,10 @@
.container {
+<<<<<<< HEAD
column-count: 6;
+=======
+ column-count: 6;
+ column-width: 160px;
+>>>>>>> 0fa5e397b1737adc1bf34fb36951e1f7526c11bb
column-fill: auto;
column-rule: dotted 1px black;
height: 95vh;