Skip to content
Snippets Groups Projects
Commit d82045f5 authored by SeeBasTStick's avatar SeeBasTStick
Browse files

Merge branch 'prob2_connection'

# Conflicts:
#	src/main/kotlin/b/language/server/BDocumentService.kt
#	src/main/kotlin/b/language/server/BWorkspaceService.kt
#	src/main/kotlin/b/language/server/Server.kt
#	src/main/kotlin/b/language/server/communication/Communicator.kt
#	src/main/kotlin/b/language/server/dataStorage/Settings.kt
#	src/main/kotlin/b/language/server/proBMangement/probCli/CommandCouldNotBeExecutedException.kt
#	src/main/kotlin/b/language/server/proBMangement/probCli/PathCouldNotBeCreatedException.kt
#	src/main/kotlin/b/language/server/proBMangement/probCli/ProBCommandLineAccess.kt
#	src/test/kotlin/b/language/server/ProBCommandLineTest.kt
parents 22d60847 dc961daf
No related merge requests found
Showing
with 422 additions and 94 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment