Resolved leftover merge conflict

.travis.yml

@@ -3,17 +3,10 @@ language: cpp
 before_install:
  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
  - sudo apt-get update -qq
-<<<<<<< HEAD
- - sudo apt-get install -qq libcurl4-openssl-dev libjsoncpp-dev libargtable2-dev libgnutls-dev libgcrypt11-dev valgrind wget
- - wget ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.38.tar.gz
- - tar -xvf libmicrohttpd-0.9.38.tar.gz
- - cd libmicrohttpd-0.9.38
-=======
  - sudo apt-get install -qq libcurl4-openssl-dev libjsoncpp-dev libargtable2-dev libgnutls-dev libgcrypt11-dev valgrind wget gcc-4.8 g++-4.8
  - wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
  - tar -xvf libmicrohttpd-0.9.44.tar.gz
  - cd libmicrohttpd-0.9.44
->>>>>>> upstream/0.7.0
  - ./configure && make
  - sudo make install && sudo ldconfig
  - cd .. && sudo rm -rf libmicrohttpd-0.9.44