onlinces/hackathon-the-last-line-321f7588dc634ec9af21a291319c98aa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix marge conflicts

Browse Source
This commit is contained in:
Angel Osvaldo Frias Arriaga
2026-05-23 08:16:59 -06:00
parent fdc6f8bb2d a80ea289fd
commit cf9bdba59b
14 changed files with 307 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,4 +1,8 @@
<<<<<<< HEAD
#Fri May 22 14:58:18 CST 2026
=======
#Fri May 22 15:16:44 CST 2026
>>>>>>> a80ea289fd32cc25c1aadbfa295b6f00b7b775f6
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb