cleaning code

chav170 · chav170 · commit c6f36a3ca71f · 2025-05-01T13:26:42.000+01:00
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -60,7 +60,6 @@ public function routes($routes): void
     }
 
     /**
-<<<<<<< HEAD
      * Middleware registrator and holder.
      *
      * @param \Cake\Routing\RouteBuilder $routes Routes.

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public function routes($routes): void`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
`63`		`-<<<<<<< HEAD`
`64`	`63`	`* Middleware registrator and holder.`
`65`	`64`	`*`
`66`	`65`	`* @param \Cake\Routing\RouteBuilder $routes Routes.`