Merge pull request 'Conflict Part 1' (#5) from conflict1 into development
All checks were successful
Build (KnockOutWhist) TeamCity build finished
All checks were successful
Build (KnockOutWhist) TeamCity build finished
Reviewed-on: #5
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
object Main {
|
||||
|
||||
class KnockOutWhist {
|
||||
|
||||
//Conflict reason
|
||||
}
|
||||
|
||||
val eol = sys.props("line.separator")
|
||||
|
||||
Reference in New Issue
Block a user