Skip to content

Commit 4ce171a

Browse files
committed
# Conflicts: # docs/vercel.json
2 parents 3bfa700 + dd2351a commit 4ce171a

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

docs/vercel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"buildCommand": "npm run build",
33
"installCommand": "npm install",
4+
<<<<<<< HEAD
45
"framework": "nextjs"
6+
=======
7+
"framework": "nextjs",
8+
"ignoreCommand": "exit 0"
9+
>>>>>>> dd2351a2944e00e54590eaf9e05a8c772a07e350
510
}

0 commit comments

Comments
 (0)