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/bash_echo_terminal.sh b/bash_echo_terminal.sh index 08e2251..c7ed72d 100755 --- a/bash_echo_terminal.sh +++ b/bash_echo_terminal.sh @@ -12,4 +12,8 @@ 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" +echo "Andrew should go here once we figure this out. (Andrew was here!)" +echo "Jingxuan was here." + 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