diff options
| author | Siqi LIU <me@siqi.fr> | 2013-08-15 13:26:50 +0800 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-08-15 13:26:50 +0800 |
| commit | 867bdd36e700f67f997c0867d521a0c725597121 (patch) | |
| tree | f3f953309a127924c37c8b1c3e589b03d65a3942 /ios | |
| parent | 8f44dc9a04485beb8317bed2a928ac65a4a5493a (diff) | |
.DS_Store conflict
Change-Id: I77ea908ffd8fadbbea7ef5a4726df447718f2323
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/iosremote/iosremote/en.lproj/.DS_Store | bin | 6148 -> 6148 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/ios/iosremote/iosremote/en.lproj/.DS_Store b/ios/iosremote/iosremote/en.lproj/.DS_Store Binary files differindex 5008ddfcf53c..3e7856eece30 100644 --- a/ios/iosremote/iosremote/en.lproj/.DS_Store +++ b/ios/iosremote/iosremote/en.lproj/.DS_Store |