Skip to content
Snippets Groups Projects
Commit 5ae88bc6 authored by Gabriel Copat's avatar Gabriel Copat
Browse files

Merge remote-tracking branch 'origin/cleanup' into cleanup 

# Conflicts:
#	src/main/java/team5/smartTowns/towns/TownStorage.java
parents cb6e801c 95e4222f
1 merge request!32CODE CLEANUP FROM SPRINT #2
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment