Commit a7011a6

davidsvantesson

committed

Merge branch 'master' into davidsvantesson-patch-1

# Conflicts: # test3.tst

2 parents 413a098 + 8655585 commit a7011a6Copy full SHA for a7011a6

1 file changed

+1

-1

lines changed

test3.tst

1 file changed

+1

-1

lines changed

`‎test3.tst`

+1-1

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Test edit`
`2`		`-branch`
	`2`	`+master`

Comments

(0)