Removed uneeded installs from travis script 🚀

Author: chicio

.travis.yml

@@ -11,6 +11,5 @@ addons:
     packages:
       - libcurl4-openssl-dev  
 before_script:
-  - gem install github-pages
   - npm install
 script: npm run test

CHANGELOG.md

@@ -1,7 +1,6 @@
 # Change Log
 All changes to Chicio coding will be documented in this file.
 
-<<<<<<< HEAD
 ## [1.2.0](https://github.com/chicio/chicio.github.io/releases/tag/1.2.0)
 Release date: 2019-03-10.
 
@@ -12,13 +11,13 @@ Release date: 2019-03-10.
 
 #### Fixed
 - install process now uses pages gem with bundler installation for gulp build
-=======
+
+
 ## [1.1.6](https://github.com/chicio/chicio.github.io/releases/tag/1.1.6)
 Release date: 2019-03-03.
 
 #### Added
 - new pages-gem release
->>>>>>> master
 
 
 ## [1.1.5](https://github.com/chicio/chicio.github.io/releases/tag/1.1.5)