From 9209c0dfeb6dd85566ad1df26cc41b2ce8fe5f9d Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@icloud.com>
Date: Thu, 7 Jul 2022 14:55:22 -0700
Subject: [PATCH] Fixed merge conflict

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

diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 133edcd9067ffda1d74e3c0e7d6f3a340f8fe87c..3be25b86b12a7bcad33453319266b0b9638755ef 100644
--- a/crates/terminal/src/terminal.rs
+++ b/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,
         };