From 867bdd36e700f67f997c0867d521a0c725597121 Mon Sep 17 00:00:00 2001
From: Siqi LIU <me@siqi.fr>
Date: Thu, 15 Aug 2013 13:26:50 +0800
Subject: .DS_Store conflict

Change-Id: I77ea908ffd8fadbbea7ef5a4726df447718f2323
---
 ios/iosremote/iosremote/en.lproj/.DS_Store | Bin 6148 -> 6148 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'ios')

diff --git a/ios/iosremote/iosremote/en.lproj/.DS_Store b/ios/iosremote/iosremote/en.lproj/.DS_Store
index 5008ddfcf53c..3e7856eece30 100644
Binary files a/ios/iosremote/iosremote/en.lproj/.DS_Store and b/ios/iosremote/iosremote/en.lproj/.DS_Store differ
-- 
cgit