1 files changed, 8 insertions, 1 deletions
diff --git a/hacklabxl.css b/hacklabxl.css
index 5604174..e0361af 100644
--- a/hacklabxl.css
+++ b/hacklabxl.css
@@ -1,6 +1,10 @@
 .container {
+<<<<<<< HEAD
+  column-count: 6;
+=======
   column-count:  6;
   column-width: 160px;
+>>>>>>> 0fa5e397b1737adc1bf34fb36951e1f7526c11bb
   column-fill: auto;
   column-rule: dotted 1px black;
   height: 95vh;
@@ -14,6 +18,9 @@ div#neutrinet {
 .fhri {
   width: 100%;
 }
-
+.bouche {
+  color: red;
+  font-size: 2em;
+}
 
 /* */