Skip to content

Commit

Permalink
Fix merge conflict from Unit tests PR.
Browse files Browse the repository at this point in the history
  • Loading branch information
Harsha Bonthu committed Mar 12, 2016
1 parent 1171a4c commit b339b38
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions testbed/init.sh
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/bin/bash
cordova platform add ios android
<<<<<<< HEAD

cordova plugin add ../ --link --variable BRANCH_LIVE_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed --variable ENCODED_ID=X9Ug
cordova plugin add https://github.com/nordnet/cordova-universal-links-plugin.git
cordova plugin add ../ --link --variable BRANCH_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed

# Include this plugin if you want to run a unit-test for the plugin
cordova plugin add http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework.git
cordova plugin add ../ --link --variable BRANCH_LIVE_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable BRANCH_TEST_KEY=key_test_oicIH5u2yxW9w3i6UZdfCiokyrixWpBJ --variable URI_SCHEME=testbed --variable ENCODED_ID=X9Ug
# cordova plugin add http://git-wip-us.apache.org/repos/asf/cordova-plugin-test-framework.git
# cordova plugin add ../ --link --variable BRANCH_KEY=key_live_fnmRM1FXtu11t6e4LU8WsldpvDcA0bzv --variable URI_SCHEME=testbed

0 comments on commit b339b38

Please sign in to comment.