Permalink
Browse files

resolved conflict in android/assets/www/phonegap.js file

  • Loading branch information...
1 parent ec901ba commit bcb8c047cf7edb29d184b6d570b8de103e3e66b4 @sintaxi sintaxi committed Aug 23, 2009
Showing with 1,141 additions and 1,321 deletions.
  1. +0 −1 Makefile
  2. +1,141 −1,320 android/assets/www/phonegap.js
View
@@ -114,7 +114,6 @@ android: lib/android/phonegap-min.js
lib/android/phonegap-min.js: lib/android/phonegap.js
$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/android/phonegap.js
-<<<<<<< HEAD:Makefile
lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/android/device.js javascripts/android/geolocation.js javascripts/android/notification.js javascripts/android/camera.js
$(MKPATH) lib/android
$(RM_F) $@
Oops, something went wrong.

0 comments on commit bcb8c04

Please sign in to comment.