fixed merge conflict

This commit is contained in:
Nathaniel Kenschaft 2020-06-16 23:44:23 -04:00
commit 293a4b5ffb

View File

@ -156,9 +156,10 @@ work at ANY TIME. Simply go to the 'Students' directory and select the student's
============
As a student, you can edit your work for certain classes and submit assignments. By default, your workr directory (your username) has a single readme. AND IT SHOULD STAY THAT WAY.
To make changes to a class, you must first select that class via the CLI.::
To make changes to a class, you must first select that class via the CLI.
Select a class first:
Select a class first:
::
? Select class: (Use arrow keys)
English12_eharris1
Art12_eharris1