Skip to content
Snippets Groups Projects
  • Connor Brock's avatar
    Merge remote-tracking branch 'origin/main' into... · aa9d0003
    Connor Brock authored
    Merge remote-tracking branch 'origin/main' into 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
    
    # Conflicts:
    #	src/main/resources/schema.sql
    #	src/test/java/Team5/SmartTownsOld/DataSourceConfig.java
    #	src/test/java/Team5/SmartTownsOld/DataSourceConfigahhhh.java
    aa9d0003
Code owners
Assign users and groups as approvers for specific file changes. Learn more.