# Conflicts: # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock