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

1
.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
CamionBasura

10
.idea/deploymentTargetSelector.xml generated
View File

@@ -4,6 +4,16 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<<<<<<< HEAD
=======
<DropdownSelection timestamp="2026-05-23T03:25:21.703330800Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=RFCW11GVGSV" />
</handle>
</Target>
</DropdownSelection>
>>>>>>> a80ea289fd32cc25c1aadbfa295b6f00b7b775f6
<DialogSelection />
</SelectionState>
</selectionStates>

3
.idea/gradle.xml generated
View File

@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<<<<<<< HEAD
<component name="GradleMigrationSettings" migrationVersion="1" />
=======
>>>>>>> a80ea289fd32cc25c1aadbfa295b6f00b7b775f6
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>