fix merge

ory · Sep 16, 2024 · 3336170 · 3336170
1 parent 74914b9
commit 3336170
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -1,9 +1,6 @@
 go 1.22
-<<<<<<< hperl/bump-go-jose
 
 toolchain go1.22.5
-=======
->>>>>>> master
 
 module github.com/ory/oathkeeper