Merge branch 'main' of https://homehud.duckdns.org/javier/Nexora

resources/views/projects/create.blade.php

@@ -197,9 +197,15 @@
                                     <div>
                                         <x-label for="longitude" :value="__('Longitud')" />
                                         <input type="number" 
+<<<<<<< HEAD
                                             id="longitude"
                                             name="longitude" 
                                             value="{{ old('longitude') }}"
+=======
+                                            id="latitude"
+                                            name="latitude" 
+                                            value="{{ old('latitude') }}"
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
                                             step="any"
                                             class="border-b-1 border-gray-300 focus:border-blue-500 focus:outline-none">
                                     </div>
@@ -308,7 +314,11 @@
                                             
                                             <template x-if="files.length === 0">
                                                 <div>
+<<<<<<< HEAD
                                                     <x-icons icon="upload" class="mx-auto h-12 w-12 text-gray-400" />
+=======
+                                                    <x-icons.upload class="mx-auto h-12 w-12 text-gray-400" />
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
                                                     <p class="mt-1 text-sm text-gray-600">
                                                         Arrastra archivos o haz clic para subir
                                                     </p>