update config

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