fix merge conflict

packbackbooks · Dec 1, 2023 · 3e0ac10 · 3e0ac10
1 parent 292df0e
commit 3e0ac10
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
@@ -52,11 +52,7 @@ public function getPublicJwks()
     }
 
     /**
-<<<<<<< HEAD
      * @deprecated
-=======
-     * @todo: Deprecate this in the next major version
->>>>>>> mgmt-132-migrations
      */
     public function outputJwks()
     {