GitHub PushEvent at 2014-09-30 16:01:45
Repository: NorkartCordova
Actor: Lundemoo
Payload: {"shas":[["4cccec2472037b4f85cd0e901c0c3f64d5a4324d","fa0c28b5bd050baa24f442bd0b93e8fef9166669@hotmail.com","Merge origin/master\n\nConflicts:\n\tnbproject/project.properties\n\tplatforms/android/CordovaLib/ant-build/AndroidManifest.xml.d\n\tplatforms/android/CordovaLib/ant-gen/R.java.d\n\tplatforms/android/CordovaLib/build.xml\n\tplatforms/android/CordovaLib/proguard-project.txt\n\tplatforms/android/ant-build/AndroidManifest.xml.d\n\tplatforms/android/ant-build/NorkartCordova-debug-unaligned.apk.d\n\tplatforms/android/ant-build/R.txt\n\tplatforms/android/ant-build/classes.dex.d\n\tplatforms/android/ant-build/proguard.txt\n\tplatforms/android/ant-gen/com/coolappz/NorkartCordova/R.java\n\tplatforms/android/build.xml\n\tplatforms/android/proguard-project.txt\n\twww/js/mapController.js\n\twww/templates/map-index.html","Lundemoo",true],["5a16e01e818dbe9081d338ea37b4502b15c7ff6b","fa0c28b5bd050baa24f442bd0b93e8fef9166669@hotmail.com","Merge origin/master","Lundemoo",true]],"size":2,"ref":"refs/heads/master","head":"5a16e01e818dbe9081d338ea37b4502b15c7ff6b"}