Merge remote-tracking branch 'origin/main'

# Conflicts: # .gradle/8.0/checksums/checksums.lock # .gradle/8.0/checksums/md5-checksums.bin # .gradle/8.0/checksums/sha1-checksums.bin # .gradle/8.0/executionHistory/executionHistory.bin # .gradle/8.0/executionHistory/executionHistory.lock # .gradle/8.0/fileHashes/fileHashes.bin # .gradle/8.0/fileHashes/fileHashes.lock # .gradle/8.0/fileHashes/resourceHashesCache.bin # .gradle/buildOutputCleanup/buildOutputCleanup.lock # .gradle/buildOutputCleanup/outputFiles.bin # .gradle/file-system.probe # tappaybutton/build.gradle.kts
Tap-Payments · Oct 30, 2023 · 1791dcd · 1791dcd
2 parents 8fb37c2 + 2b5f6b1
commit 1791dcd
Show file tree

Hide file tree

Showing 19 changed files with 1,308 additions and 47 deletions.
diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Thu Oct 26 10:40:23 AST 2023
+#Thu Oct 26 15:30:33 AST 2023
 gradle.version=8.0
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/AhlaamK.xml b/.idea/copyright/AhlaamK.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml