Skip to content
Snippets Groups Projects
Commit b1bcd1cf authored by Glavina Haley's avatar Glavina Haley
Browse files

Merge branch 'master' into 'TeamB'

# Conflicts:
#   src/HelloWorld.java
parents 8bbd12f9 754e77aa
No related branches found
No related tags found
No related merge requests found
# 2XB3 Group 11 [Def. need a better name!] Repository
# 2XB3 Group 11 - Trawl Expert - Repository
This is our repository for everything relating to our project for 2XB3.
# Opening this project in Eclipse
......@@ -25,4 +25,7 @@ files are generated automatically by Eclipse when you run your code; they're
ananlogous to *.o files we dealt with in C last semester. Therefore, it is
pointless and a pain to include them in the repository. So you don't need to
try to `git add` these files and don't worry that they're not showing up on the
repository online.
\ No newline at end of file
repository online.
# Link for Google Drive meeting minutes
* https://drive.google.com/drive/folders/1mKG5EY-oi8i9HsSlXeakLXsSqUTnXHjQ?usp=sharing
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment