Conflict solved

Author: tommygonzaleza

.gitpod.Dockerfile

@@ -1,4 +1,4 @@
 FROM gitpod/workspace-full
 USER gitpod
 RUN pip3 install pytest==4.4.2 pytest-testdox mock
-RUN npm i learnpack@0.1.12 -g && learnpack plugins:install learnpack-python@0.0.34
+RUN npm i learnpack@0.1.14 -g && learnpack plugins:install learnpack-python@0.0.35

.gitpod.yml

@@ -1,10 +1,9 @@
 image:
   file: .gitpod.Dockerfile
 
-# List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
 ports:
-  - port: 3000
-    onOpen: ignore
+    - port: 3000
+      onOpen: ignore
 
 vscode:
   extensions:
@@ -17,4 +16,4 @@ github:
         # enable for pull requests coming from this repo (defaults to true)
         pullRequests: false
         # add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
-        addComment: false
+        addComment: false