Fixed merge conflict

Mikayla Maki created 3 years ago

Change summary

crates/terminal/src/terminal.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Detailed changes

crates/terminal/src/terminal.rs

@@ -129,7 +129,7 @@ impl Terminal {
         .detach();
 
         let pty_config = PtyConfig {
-            shell: None,
+            shell: None, //Use the users default shell
             working_directory: working_directory.clone(),
             hold: false,
         };