update config

abhishekmj303 · Dec 15, 2023 · ccac1d7 · ccac1d7
1 parent bebdf21
commit ccac1d7
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/config/sampleconfig.toml b/config/sampleconfig.toml
@@ -55,9 +55,4 @@ client-alive-interval = 300
 client-alive-count-max = 2
 allow-users = ["user1", "user2"]
 allow-groups = ["group1", "group2"]
-x11-forwarding = false
-<<<<<<< new-branch
-x11-forwarding = false
-=======
-x11-forwarding = false
->>>>>>> main
+x11-forwarding = false