From a024948a5d00f19e97c5574ba173ee8851ab4536 Mon Sep 17 00:00:00 2001
From: Siqi LIU <me@siqi.fr>
Date: Tue, 30 Jul 2013 23:28:50 +0200
Subject: resolve conflicts

Change-Id: If0a7146f51741e3e8250f0aa671a6902119bb6eb
---
 setup_native/source/mac/ooo/DS_Store | Bin 15364 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 setup_native/source/mac/ooo/DS_Store

(limited to 'setup_native')

diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
deleted file mode 100644
index fec0edc61bc5..000000000000
Binary files a/setup_native/source/mac/ooo/DS_Store and /dev/null differ
-- 
cgit