From: sungmin ha <sungmin82.ha@samsung.com>
Date: Fri, 10 Aug 2012 12:54:21 +0000 (+0900)
Subject: [Title]delete conflict garbage
X-Git-Tag: TizenStudio_2.0_p2.3~1392
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed70cd22d6785a9d8c2e1514e27c1ff47d3c8515;p=sdk%2Femulator%2Fqemu.git

[Title]delete conflict garbage
[Type] 		// Commit Type: Feature / Bugfix / Enhancement
[Module]	// Module Name - (Main / Sub)
[Priority] 	// Importance : Critical / Major / Minor
[Jira#]		// Jira Issue Number
[Redmine#] 	// Redmine Isuue Number
[Problem] 	// Problem Description
[Cause] 	// Cause Description
[Solution]	// Solution Description
[TestCase] 	// Executed the test-target (How to)
---

diff --git a/tizen/src/maru_err_table.h b/tizen/src/maru_err_table.h
index ff27db4..6d127bb 100644
--- a/tizen/src/maru_err_table.h
+++ b/tizen/src/maru_err_table.h
@@ -3,11 +3,7 @@
  *
  * Copyright (C) 2011, 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
-<<<<<<< HEAD
- * Contact: 
-=======
  * Contact:
->>>>>>> remotes/private-qm/develop
  * SeokYeon Hwang <syeon.hwang@samsung.com>
  * GiWoong Kim <giwoong.kim@samsung.com>
  * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
@@ -24,12 +20,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
-<<<<<<< HEAD
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-=======
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301, USA.
->>>>>>> remotes/private-qm/develop
  *
  * Contributors:
  * - S-Core Co., Ltd
@@ -44,13 +36,8 @@
 
 
 /* TODO: define macro for fair of definition */
-<<<<<<< HEAD
-
-enum { //This enum must match the table definition
-=======
 /* This enum must match the table definition */
 enum {
->>>>>>> remotes/private-qm/develop
     /* 0 */ MARU_EXIT_UNKNOWN = 0,
     /* 1 */ MARU_EXIT_MEMORY_EXCEPTION,
     /* 2 */ MARU_EXIT_KERNEL_FILE_EXCEPTION,
@@ -61,16 +48,9 @@ enum {
 };
 
 
-<<<<<<< HEAD
-void maru_register_exit_msg(int maru_exit_status, char* additional_msg);
-void maru_atexit(void);
-char* maru_convert_path(char *msg, const char *path);
-void maru_dump_backtrace(void* ptr, int depth);
-=======
 void maru_register_exit_msg(int maru_exit_status, char *additional_msg);
 void maru_atexit(void);
 char *maru_convert_path(char *msg, const char *path);
 void maru_dump_backtrace(void *ptr, int depth);
->>>>>>> remotes/private-qm/develop
 
 #endif /* __EMUL_ERR_TABLE_H__ */