Skip to content
Snippets Groups Projects

Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."

Merged Resolve "As a QR-scanning connoisseur , I want to unlock stickers after scanning a QR code to feel a sense of reward."
73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense into main
Merged
Gabriel Copatrequested to merge
73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense into main
Viewing commit b3a76168
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline

Files

  • b3a76168
    Gabriel Copat
    Merge branch 'main' into... · b3a76168
    Gabriel Copat authored 
    Merge branch 'main' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/Team5/SmartTowns/data/MockUser.java
#	src/main/java/Team5/SmartTowns/data/QRCodes.java
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/java/Team5/SmartTowns/users/User.java
#	src/main/java/Team5/SmartTowns/users/UserRepository.java
#	src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql