Valid github action

anypay · Apr 17, 2024 · a80e0c4 · a80e0c4
1 parent 93a4a18
commit a80e0c4
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,15 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-<<<<<<< HEAD
-<<<<<<< HEAD
         image: postgis/postgis
-=======
-        image: postgres:14
->>>>>>> 1e538ac9 ([CI] Upgrade postgres to 14 from 10.10 in github actions)
-=======
-        image: postgis/postgis
->>>>>>> a5a9b950 ([CI] Attempt to use postgis image rather than base postgres in action)
         env:
           # optional (defaults to `postgres`)
           POSTGRES_DB: postgres_db
@@ -79,4 +71,3 @@ jobs:
           npx prisma db push
           npm test
       - uses: codecov/codecov-action@v3
-