fix table syntax

go-vela · Jun 24, 2024 · 83d28ac · 83d28ac
1 parent aa198ba
commit 83d28ac
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/database/step/table.go b/database/step/table.go
@@ -30,11 +30,8 @@ steps (
 	host          VARCHAR(250),
 	runtime       VARCHAR(250),
 	distribution  VARCHAR(250),
-<<<<<<< HEAD
 	check_id      INTEGER,
-=======
 	report_as     VARCHAR(250),
->>>>>>> hackathon/github_app
 	UNIQUE(build_id, number)
 );
 `
@@ -60,11 +57,8 @@ steps (
 	host          TEXT,
 	runtime       TEXT,
 	distribution  TEXT,
-<<<<<<< HEAD
 	check_id      INTEGER,
-=======
 	report_as     TEXT,
->>>>>>> hackathon/github_app
 	UNIQUE(build_id, number)
 );
 `