github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

forgot to resolve conflict

Browse Source
This commit is contained in:
Anis Kadri 2011-10-14 15:49:16 -07:00
parent 5faed8378c
commit ac509369e9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/res/xml/phonegap.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<phonegap> <phonegap>
<access origin="http://127.0.0.1*"/> <access origin="http://127.0.0.1*"/>
<<<<<<< HEAD
=======
<log level="DEBUG"/> <log level="DEBUG"/>
>>>>>>> 7ee04ebf313c7403cf623a1f9c00b6b5e7cc9f0b
</phonegap> </phonegap>