fix lingering merge issue

Doug Black · Doug Black · commit 6f0f3a616c19 · 2013-09-05T15:38:11.000-07:00
diff --git a/src/main/java/com/twilio/sdk/resource/instance/Transcription.java b/src/main/java/com/twilio/sdk/resource/instance/Transcription.java
@@ -8,10 +8,7 @@
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.TwilioRestClient;
 import com.twilio.sdk.TwilioRestResponse;
-<<<<<<< HEAD
 import com.twilio.sdk.TwilioRestException;
-=======
->>>>>>> 7819b025c17f946a320e14b4ff9c1b0da44433c7
 import com.twilio.sdk.resource.InstanceResource;
 
 /**
