minor fixes

prisma · Feb 10, 2020 · a1bb633 · a1bb633
1 parent cb9e3e4
commit a1bb633
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/getting-started/start-from-scratch-with-empty-db/README.md b/docs/getting-started/start-from-scratch-with-empty-db/README.md
@@ -5,8 +5,4 @@ There are two ways how you can use Prisma with an empty database:
 - [Define your database schema and run migrations using SQL](./quickstart-sql.md) (recommended)
 - [Define your database schema via Prisma and run migrations using Prisma Migrate](./quickstart-prisma-migrate.md) (experimental)
 
-<<<<<<< HEAD
 > **Warning**: Prisma Migrate is currently in an **experimental** state. When using any of the the `prisma2 migrate` commands, you need to explicitly opt-in to that functionality via an `--experimental` flag, e.g. `prisma2 migrate save --experimental`.
-=======
-> **Warning**: Prisma Migrate is currently in an **experimental** state. When using any of the commands below, you need to explicitly opt-in via an `--experimental` flag, e.g. `prisma2 migrate save --name 'init' --experimental`.
->>>>>>> c134ae04fc192f790c732f558c48c23666b9aa8a