rebase fix

statnett · Oct 30, 2023 · 894bb9b · 894bb9b
1 parent 61e02d5
commit 894bb9b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,11 +14,7 @@ Then the broker must be instructed to use this class to build principals by
 adding the following to the configuration file:
 
 ```properties
-<<<<<<< Updated upstream
-principal.builder.class=io.statnett.k3a-spiffe.SpiffePrincipalBuilder
-=======
 principal.builder.class=io.statnett.k3a.authz.spiffe.SpiffePrincipalBuilder
->>>>>>> Stashed changes
 ```
 
 ## References