Recuperando cambios peridos en el merge?

This commit is contained in:
imnavajas
2023-05-16 14:13:42 +02:00
parent 224ea78c3c
commit dd9686d966
9 changed files with 66 additions and 43 deletions

9
.idea/deployment.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" autoUpload="Always" serverName="SK-IMN" remoteFilesAllowedToDisappearOnAutoupload="false">
<component name="PublishConfigData" autoUpload="Always" serverName="SK-MAIN" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="SK-IMN">
<serverdata>
@ -9,6 +9,13 @@
</mappings>
</serverdata>
</paths>
<paths name="SK-MAIN">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
<option name="myAutoUpload" value="ALWAYS" />
</component>