From ed70cd22d6785a9d8c2e1514e27c1ff47d3c8515 Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Fri, 10 Aug 2012 21:54:21 +0900 Subject: [PATCH] =?utf8?q?[Title]delete=20conflict=20garbage=20[Type]=20?= =?utf8?q?=09=09//=20Commit=20Type:=20Feature=20/=20Bugfix=20/=20Enhanceme?= =?utf8?q?nt=20[Module]=09//=20Module=20Name=20-=20(Main=20/=20Sub)=20[Pri?= =?utf8?q?ority]=20=09//=20Importance=C2=A0:=20Critical=20/=20Major=20/=20?= =?utf8?q?Minor=20[Jira#]=09=09//=20Jira=20Issue=20Number=20[Redmine#]=20?= =?utf8?q?=09//=20Redmine=20Isuue=20Number=20[Problem]=20=09//=20Problem?= =?utf8?q?=20Description=20[Cause]=20=09//=20Cause=20Description=20[Soluti?= =?utf8?q?on]=09//=20Solution=20Description=20[TestCase]=20=09//=20Execute?= =?utf8?q?d=20the=20test-target=20(How=20to)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tizen/src/maru_err_table.h | 20 -------------------- 1 file changed, 20 deletions(-) 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 * GiWoong Kim * YeongKyoon Lee @@ -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__ */ -- 2.7.4