remove comments

HarvsG · HarvsG · commit 66d633739b28 · 2021-04-17T13:50:29.000+01:00
diff --git a/web_src/less/_markup.less b/web_src/less/_markup.less
@@ -473,8 +473,6 @@
     box-shadow: inset 0 -1px 0 var(--color-secondary);
   }
 
-<<<<<<< HEAD
-=======
   .csv-data td,
   .csv-data th {
     padding: 5px;
@@ -500,7 +498,6 @@
     border-top: 0;
   }
 
->>>>>>> e38bfb88d... rename _markdown to _markup
   .ui.list .list,
   ol.ui.list ol,
   ul.ui.list ul {

Original file line number	Diff line number	Diff line change
`@@ -473,8 +473,6 @@`
`473`	`473`	`box-shadow: inset 0 -1px 0 var(--color-secondary);`
`474`	`474`	`}`
`475`	`475`
`476`		`-<<<<<<< HEAD`
`477`		`-=======`
`478`	`476`	`.csv-data td,`
`479`	`477`	`.csv-data th {`
`480`	`478`	`padding: 5px;`
`@@ -500,7 +498,6 @@`
`500`	`498`	`border-top: 0;`
`501`	`499`	`}`
`502`	`500`
`503`		`->>>>>>> e38bfb88d... rename _markdown to _markup`
`504`	`501`	`.ui.list .list,`
`505`	`502`	`ol.ui.list ol,`
`506`	`503`	`ul.ui.list ul {`