Fix merge errors.

.travis.yml

@@ -1,12 +1,10 @@
 before_install:
   - sudo apt-get update -qq
-<<<<<<< HEAD
   - sudo apt-get install cmake
 
 env:
   global:
     - secure: "lZ7pHQvl5dpZWzBQAaIMf0wqrvtcZ4wiZKeIZjf83TEsflW8+z0uTpIuN30ZV6Glth/Sq1OhLnTP5+N57fZU/1ebA5twHdvP4bS5CIUUg71/CXQZNl36xeaqvxsG/xRrdpKOsPdjAOsQ9KPTQulsX43XDLS7CasMiLvYOpqKcPc="
-=======
   - sudo apt-get install cmake python3
   - if [ $LINUX ]; then sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; fi
   - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h
@@ -66,3 +64,4 @@ addons:
     build_command_prepend: "cmake . -DASSIMP_ENABLE_BOOST_WORKAROUND=YES"
     build_command: "make"
     branch_pattern: coverity_scan
+