From df59d55631aaae0b290696cf7346b071053dc005 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Fri, 26 Sep 2014 09:25:59 -0700
Subject: Fix Build - remove merge conflict markers.

Change-Id: I8de2abce4b43d0c981216079d267e1f61c0f805b
---
 res/values-lt/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'res/values-lt')

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 428df7996..2705a013d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -255,8 +255,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"praleistieji"</string>
     <string name="content_description_recent_call" msgid="6204048362763219585">"Naujausias skambutis. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Spustelėkite, atskambintumėte"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-<<<<<<< HEAD
     <string name="photo_file_provider_authority" msgid="7609339524372399628">"com.android.contacts.files"</string>
-=======
->>>>>>> d30c3c2d
 </resources>
-- 
cgit v1.2.3