test(auth): remove rebase marker (#399) (thanks @carrotRakko)

2026-03-08 00:42:15 +00:00 · 2026-03-08 00:42:15 +00:00 · db92d47d5e
commit db92d47d5e
parent 91b0baa92d
1 changed files with 0 additions and 1 deletions
--- a/internal/googleapi/service_account_test.go
+++ b/internal/googleapi/service_account_test.go
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package googleapi

 import (