search

SamanthaGuillemette / SOEN390

SOEN390 Project
MIT License
5 stars 0 forks source link

fixed merge conflict in QR client app #242

Closed SamanthaGuillemette closed 2 years ago

SamanthaGuillemette commented 2 years ago

QR in client app wasn't conflict free, now it's fixed.