chore(): resolve merge conflicts

nestjs · Apr 1, 2022 · 42d0e92 · 42d0e92
2 parents 9001b56 + 29de0e7
commit 42d0e92
Show file tree

Hide file tree

Showing 4 changed files with 2,400 additions and 1,284 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@
 ## Installation
 
 ```bash
-$ npm i --save @nestjs/typeorm typeorm
+$ npm i --save @nestjs/typeorm typeorm@0.2
 ```
 
 ## Quick Start

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   postgres:
-    image: postgres:14.1
+    image: postgres:14.2
     environment:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: root