fix merge conflicts

sten · sten · commit 2b3fddd6c9b3 · 2024-07-16T14:09:09.000+02:00
diff --git a/src/FilamentFlexibleBlocksAssetManagerServiceProvider.php b/src/FilamentFlexibleBlocksAssetManagerServiceProvider.php
@@ -99,9 +99,11 @@ public function packageBooted(): void
         ], true);
 
         //add policies
-        if(FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()){
-            Gate::policy(\Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset::class,
-                FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy());
+        if (FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()) {
+            Gate::policy(
+                \Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset::class,
+                FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()
+            );
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ public function packageBooted(): void`
`99`	`99`	`], true);`
`100`	`100`
`101`	`101`	`//add policies`
`102`		`- if(FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()){`
`103`		`- Gate::policy(\Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset::class,`
`104`		`- FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy());`
	`102`	`+ if (FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()) {`
	`103`	`+ Gate::policy(`
	`104`	`+ \Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset::class,`
	`105`	`+ FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()`
	`106`	`+ );`
`105`	`107`	`}`
`106`	`108`	`}`
`107`	`109`