Commit 8b4b9c4

committed

Conflict solved

2 parents 5f82d97 + 03fe670 commit 8b4b9c4Copy full SHA for 8b4b9c4

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`FROM gitpod/workspace-full`
`2`	`2`	`USER gitpod`
`3`	`3`	`RUN pip3 install pytest==4.4.2 pytest-testdox mock`
`4`		`-RUN npm i learnpack@0.1.12 -g && learnpack plugins:install learnpack-python@0.0.34`
	`4`	`+RUN npm i learnpack@0.1.14 -g && learnpack plugins:install learnpack-python@0.0.35`

Lines changed: 3 additions & 4 deletions

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

Comments

(0)