Update .travis.yml

.travis.yml

@@ -12,10 +12,9 @@ install:
   - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis
   - sudo service redis-server start
   - rm $TRAVIS_BUILD_DIR/.git/shallow
-  - cd ~/ && bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git
+  - cd ~/ && bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch v5.0
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
-<<<<<<< HEAD
 script:
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
@@ -24,16 +23,9 @@ script:
   - bench frappe --build_website
   - bench frappe --serve_test &
   - bench frappe --verbose --run_tests
-=======
-  - sudo apt-get install xfonts-75dpi xfonts-base -y
-  - wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.2/wkhtmltox-0.12.2_linux-precise-amd64.deb
-  - sudo dpkg -i wkhtmltox-0.12.2_linux-precise-amd64.deb
-  - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop
-  - CFLAGS=-O0 pip install --editable .
->>>>>>> da975f5a76aacc24abb71c4a26cb204f9ec72610
 
 before_script:
   - mysql -e 'create database test_frappe'
   - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
   - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
-
+