merge konflikt bereinigt
This commit is contained in:
+2
-2
@@ -6,6 +6,7 @@ for %%i in ("%~1") do (
|
||||
set "EXT=%%~xi"
|
||||
set "DIR=%%~dpi"
|
||||
)
|
||||
call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat
|
||||
|
||||
REM echo Dateiname ohne Erweiterung: %FILENAME%
|
||||
REM echo Erweiterung: %EXT%
|
||||
@@ -18,8 +19,6 @@ REM Namen der Ergebnisdateien
|
||||
set ERROR_DOUBLE=%FILENAME%_errors.json
|
||||
set RESULT_TIA=%FILENAME%-*_TIA.xlsx
|
||||
|
||||
|
||||
call C:\kabellaengen\bin\setenv.bat
|
||||
|
||||
|
||||
echo.
|
||||
@@ -44,6 +43,7 @@ if not exist "%PROJECT_WORK%\%RESULT_TIA%" (
|
||||
goto :eof
|
||||
)
|
||||
mkdir %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
echo move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
pause
|
||||
goto :eof
|
||||
|
||||
Reference in New Issue
Block a user