Update settings.json

ff6347 · web-flow · commit aa5b3fe16f30 · 2020-04-05T22:32:05.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,4 @@
 {
-<<<<<<< HEAD
-=======
   "workbench.colorCustomizations": {
     "activityBar.background": "#6ca2ee",
     "activityBar.foreground": "#15202b",
@@ -25,5 +23,4 @@
     "latex",
     "plaintext"
   ]
->>>>>>> develop
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`		`-<<<<<<< HEAD`
`3`		`-=======`
`4`	`2`	`"workbench.colorCustomizations": {`
`5`	`3`	`"activityBar.background": "#6ca2ee",`
`6`	`4`	`"activityBar.foreground": "#15202b",`
`@@ -25,5 +23,4 @@`
`25`	`23`	`"latex",`
`26`	`24`	`"plaintext"`
`27`	`25`	`]`
`28`		`->>>>>>> develop`
`29`		`-}`
	`26`	`+}`