fix merge conflicts

4 years ago · 0755cabd73
parent d9ceb72c2e 159d752795
commit 0755cabd73
1 changed files with 1 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = feature/KASM-1834_anti_aliasing
+	branch = master