From 6205a50535898886ee024da510ea4576bb512f34 Mon Sep 17 00:00:00 2001 From: Jingxuan Gong Date: Thu, 11 Sep 2025 11:26:13 -0500 Subject: [PATCH 1/4] Update bash_echo_terminal.sh --- bash_echo_terminal.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bash_echo_terminal.sh b/bash_echo_terminal.sh index 08e2251..9cc4a91 100755 --- a/bash_echo_terminal.sh +++ b/bash_echo_terminal.sh @@ -12,4 +12,5 @@ echo "" echo "Here is a list of awesome ANVIL members who are learning git:" echo "Molly, after many years a PI needs a refresher!" -echo "Andrew should go here once we figure this out. (Andrew was here!)" \ No newline at end of file +echo "Andrew should go here once we figure this out. (Andrew was here!)" +echo "Jingxuan was here!" \ No newline at end of file From 8f9072b6f42762a458b0c5eee6e5eb4655ad0c2f Mon Sep 17 00:00:00 2001 From: Jingxuan Gong Date: Thu, 11 Sep 2025 11:35:11 -0500 Subject: [PATCH 2/4] Update bash_echo_terminal.sh --- bash_echo_terminal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_echo_terminal.sh b/bash_echo_terminal.sh index 9cc4a91..3e7f7ae 100755 --- a/bash_echo_terminal.sh +++ b/bash_echo_terminal.sh @@ -13,4 +13,4 @@ echo "" echo "Here is a list of awesome ANVIL members who are learning git:" echo "Molly, after many years a PI needs a refresher!" echo "Andrew should go here once we figure this out. (Andrew was here!)" -echo "Jingxuan was here!" \ No newline at end of file +echo "Jingxuan was here." \ No newline at end of file From d946ea7f8f9e782d0d8dd4ed21160ed4f52e55d2 Mon Sep 17 00:00:00 2001 From: afrels <128326125+afrels@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:38:55 -0500 Subject: [PATCH 3/4] Added figure labels and grid --- .vscode/settings.json | 4 ++++ python_line_plot.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ba2a6c0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "python-envs.defaultEnvManager": "ms-python.python:system", + "python-envs.pythonProjects": [] +} \ No newline at end of file diff --git a/python_line_plot.py b/python_line_plot.py index 3848699..bc0d67a 100755 --- a/python_line_plot.py +++ b/python_line_plot.py @@ -8,5 +8,7 @@ plt.plot([x1, x2], [y1, y2]) plt.show() - - +plt.title('A simple line plot') +plt.xlabel('x-axis') +plt.ylabel('y-axis') +plt.grid() \ No newline at end of file From 593f0752c18c956a490ec72b34d3e463f86d8850 Mon Sep 17 00:00:00 2001 From: Molly Bright <32640425+BrightMG@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:03:26 -0500 Subject: [PATCH 4/4] Molly trying to create conflicts Figuring this out slowly, added line, deleted character, etc. --- bash_echo_terminal.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bash_echo_terminal.sh b/bash_echo_terminal.sh index 08e2251..40844c7 100755 --- a/bash_echo_terminal.sh +++ b/bash_echo_terminal.sh @@ -12,4 +12,5 @@ echo "" echo "Here is a list of awesome ANVIL members who are learning git:" echo "Molly, after many years a PI needs a refresher!" -echo "Andrew should go here once we figure this out. (Andrew was here!)" \ No newline at end of file +echo "Andrew should go here once we figure this out. (Andrew was here)" +echo "Molly's change is going here, trying to conflict with an updated main branch" \ No newline at end of file