Correct configure.bat

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

configure.bat

@@ -47,16 +47,9 @@ set CFG_ROOT_DIR=%~dp0
 set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
 
 @rem ################################
-@rem # Thirdparty package locations and index handling
-<<<<<<< HEAD
+@rem # Thirdparty package locations and index handling
 set "PIP_EXTRA_ARGS=--find-links "%CFG_ROOT_DIR%\thirdparty" --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
-=======
-if exist ""%CFG_ROOT_DIR%\thirdparty"" (
-    set "PIP_EXTRA_ARGS=--find-links %CFG_ROOT_DIR%\thirdparty "
-)
-
-set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
->>>>>>> refs/remotes/skeleton/main
+
 @rem ################################
 
 @rem ################################
@@ -165,11 +158,8 @@ if %ERRORLEVEL% neq 0 (
 if exist "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" (
     rmdir /s /q "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin"
 )
-<<<<<<< HEAD
-mklink /J "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
-=======
-mklink /J %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts
->>>>>>> refs/remotes/skeleton/main
+
+mklink /J "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
 
 if %ERRORLEVEL% neq 0 (
     exit /b %ERRORLEVEL%