fixed merge conflicts

stakwork · May 15, 2024 · 50cc848 · 50cc848
1 parent 8f30485
commit 50cc848
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/db/features.go b/db/features.go
@@ -1,12 +1,9 @@
 package db
 
 import (
-<<<<<<< HEAD
+	"errors"
 	"fmt"
 	"net/http"
-=======
-	"errors"
->>>>>>> b77bffb1 (tests for Add Phases to Features)
 	"strings"
 	"time"