Update RosBE.nsi

GIT POS fix #2

RosBE-Windows/RosBE.nsi

@@ -172,20 +172,14 @@ Section -BaseFiles SEC01
     File /r Components\bin\elevate.exe
     File /r Components\bin\flash.exe
     File /r Components\bin\flex.exe
-<<<<<<< HEAD
     File /r Components\bin\flex++.exe
-=======
->>>>>>> 12534ef31a8e077df6bf8fe145e09f7e49d7d44b
     File /r Components\bin\gdb.exe
     File /r Components\bin\gdbserver.exe
     File /r Components\bin\getdate.exe
     File /r Components\bin\libeay32.dll
-<<<<<<< HEAD
     File /r Components\bin\libgcc_s_dw2-1.dll
     File /r Components\bin\libstdc++-6.dll
     File /r Components\bin\libwinpthread-1.dll
-=======
->>>>>>> 12534ef31a8e077df6bf8fe145e09f7e49d7d44b
     File /r Components\bin\log2lines.exe
     File /r Components\bin\m4.exe
     File /r Components\bin\Microsoft.VC90.CRT.manifest
@@ -214,16 +208,6 @@ Section -BaseFiles SEC01
     File /r Components\bin\tee.exe
     File /r Components\bin\wget.exe
     File /r Components\bin\zlib1.dll
-<<<<<<< HEAD
-=======
-    File /r Components\bin\libgcc_s_dw2-1.dll
-    File /r Components\bin\libstdc++-6.dll
-    File /r Components\bin\libwinpthread-1.dll
-	
-    SetOutPath "$INSTDIR\bin\data"
-    SetOverwrite try
-    File /r Components\bin\data\*.*
->>>>>>> 12534ef31a8e077df6bf8fe145e09f7e49d7d44b
     SetOutPath "$INSTDIR\samples"
     SetOverwrite try
     File /r Components\samples\*.*
@@ -245,11 +229,7 @@ Section /o "Add BIN folder to PATH variable (MSVC users)" SEC04
     ${EnvVarUpdate} $0 "PATH" "A" "HKCU" "$INSTDIR\bin"
 SectionEnd
 
-<<<<<<< HEAD
 Section /o "Update for GlobalSign Certificates (ONLY FOR XP users!!)" SEC05
-=======
-Section /o "Update for GlobalSign Certificates (XP users NEED THAT)" SEC05
->>>>>>> 12534ef31a8e077df6bf8fe145e09f7e49d7d44b
     SetOutPath "$INSTDIR\certs"
     SetOverwrite try
     File /r Components\certs\Root-E46.crt