search

lcsc-capstone / lcsc-ionic-app

LCSC's new app, built by CS and Web Dev students
0 stars 1 forks source link

Cassie tutoring #101

Closed crcahill closed 6 years ago

crcahill commented 6 years ago

tutoring pages

ninamariepeterson commented 6 years ago

There are conflicts that need to be resolved before I can merge with the master. Please pull the latest version and then make the changes and create another pull request.

ninamariepeterson commented 6 years ago

Please resolve the conflicts and I will then merge the updated pull request. Thanks

nicdford commented 6 years ago

Cassie and I went through and reviewed all the code that is being committed here and found that it has all already been merged into the master branch and this PR is unnecessary.