rename _markdown to _markup

Author: HarvsG

web_src/less/_markup.less

@@ -473,6 +473,34 @@
     box-shadow: inset 0 -1px 0 var(--color-secondary);
   }
 
+<<<<<<< HEAD
+=======
+  .csv-data td,
+  .csv-data th {
+    padding: 5px;
+    overflow: hidden;
+    font-size: 12px;
+    line-height: 1;
+    text-align: left;
+    white-space: nowrap;
+  }
+
+  .csv-data .blob-num {
+    padding: 10px 8px 9px;
+    text-align: right;
+    border: 0;
+  }
+
+  .csv-data tr {
+    border-top: 0;
+  }
+
+  .csv-data th {
+    font-weight: 600;
+    border-top: 0;
+  }
+
+>>>>>>> e38bfb88d... rename _markdown to _markup
   .ui.list .list,
   ol.ui.list ol,
   ul.ui.list ul {