Merge pull request #306 from hex-ci/patch-1

MGatner · web-flow · commit 8c9988ce8512 · 2022-08-01T05:45:50.000-04:00
diff --git a/public/assets/css/ci-theme.css b/public/assets/css/ci-theme.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* CodeIgniter 4 - Website
  ============================================================================ */
 /* Forum: 	https://forum.codeigniter.com

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`/* CodeIgniter 4 - Website`
`3`	`2`	`============================================================================ */`
`4`	`3`	`/* Forum: https://forum.codeigniter.com`