This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 8c00081cb2f66bcb668494b6b0a86df07a949d35 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:20:54 2014 +0100 merge --- .../broadcastreceiver/BootCompletedBroadcastReceiver.java | 3 --- .../saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java | 3 --- .../saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java | 6 ------ .../broadcastreceiver/SayNextActionBroadcastReceiver.java | 3 --- 4 files changed, 15 deletions(-) diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java index fc58548..554c636 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java @@ -1,6 +1,5 @@ package org.chorem.android.saymytexts.broadcastreceiver; -<<<<<<< HEAD /* * #%L * Say My Texts @@ -25,8 +24,6 @@ package org.chorem.android.saymytexts.broadcastreceiver; * #L% */ -======= ->>>>>>> feature/notification import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java index 2e160a9..cc1ea31 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java @@ -36,10 +36,7 @@ import android.speech.SpeechRecognizer; import android.util.Log; import org.chorem.android.saymytexts.SMS; import org.chorem.android.saymytexts.SayMyTextService; -<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java import org.chorem.android.saymytexts.SayMyTextsApplication; -======= ->>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java import java.util.List; diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java index 54b4426..51ab4c8 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java @@ -35,15 +35,9 @@ import android.provider.BaseColumns; import android.provider.ContactsContract; import android.telephony.SmsMessage; import android.util.Log; -<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java import org.chorem.android.saymytexts.SMS; import org.chorem.android.saymytexts.SayMyTextService; import org.chorem.android.saymytexts.SayMyTextsApplication; -======= -import org.chorem.android.saymytexts.R; -import org.chorem.android.saymytexts.SMS; -import org.chorem.android.saymytexts.SayMyTextService; ->>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java /** * Receives the SMSs and if the headset is plugged, start the service to say it out loud. diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java index c6e7ac6..3e146fc 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java @@ -40,10 +40,7 @@ import android.util.Log; import org.chorem.android.saymytexts.R; import org.chorem.android.saymytexts.SMS; import org.chorem.android.saymytexts.SayMyTextService; -<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java import org.chorem.android.saymytexts.SayMyTextsApplication; -======= ->>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java import java.util.List; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.