GitHub PushEvent at 2014-03-13 13:30:36
Repository: ToDoListAppV01
Actor: Rami4982
Payload: {"shas":[["5a0dd0e7a6c778014ba048d144da92057d5f8d91","aa743a0aaec8f7d7a1f01442503957f4d7a2d634@liminksy.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\t.idea/.name\n\t.idea/compiler.xml\n\t.idea/copyright/profiles_settings.xml\n\t.idea/encodings.xml\n\t.idea/gradle.xml\n\t.idea/libraries/ComAndroidSupportAppcompatV71901_aar.xml\n\t.idea/libraries/ComGoogleAndroidGmsPlayServices4030_aar.xml\n\t.idea/libraries/Gradle__ComAndroidSupportAppcompatV71901_aar.xml\n\t.idea/libraries/Gradle__ComGoogleAndroidGmsPlayServices4030_aar.xml\n\t.idea/libraries/Gradle__support_v4_19_0_1.xml\n\t.idea/libraries/support_v4_19_0_1.xml\n\t.idea/misc.xml\n\t.idea/modules.xml\n\t.idea/scopes/scope_settings.xml\n\t.idea/vcs.xml\n\tapp/app.iml\n\tapp/build.gradle\n\tapp/proguard-rules.txt\n\tapp/src/main/AndroidManifest.xml\n\tapp/src/main/java/il/ac/shenkar/todolist/ItemDetails.java\n\tapp/src/main/java/il/ac/shenkar/todolist/MyBroadcastReceiver.java\n\tapp/src/main/res/layout/create_task.xml\n\tapp/src/main/res/layout/item_details_view.xml\n\tapp/src/main/res/layout/main.xml\n\tapp/src/main/res/values/dimens.xml\n\tapp/src/main/res/values/strings.xml\n\tapp/src/main/res/values/styles.xml\n\tgradlew.bat\n\tsettings.gradle","david",true]],"size":1,"ref":"refs/heads/master","head":"5a0dd0e7a6c778014ba048d144da92057d5f8d91"}