From 894bb9b1972d3d0f5669d02f8eb906f09e5316b5 Mon Sep 17 00:00:00 2001
From: "Sverre H. Huseby" <shh@thathost.com>
Date: Mon, 30 Oct 2023 14:31:38 +0100
Subject: [PATCH] rebase fix

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 62a775d..07dedaa 100644
--- 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