cluster: RHEL5 - rgmanager: Fix bad merge

cluster: RHEL5 - rgmanager: Fix bad merge

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=85bc0c65b53325c5a0e0489d0b04bda15e83d3f2
Commit:        85bc0c65b53325c5a0e0489d0b04bda15e83d3f2
Parent:        50e03f60bb942d309d8198ac9d1827216ddff088
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Tue Jun 23 11:16:58 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue Jun 23 11:16:58 2009 -0400

rgmanager: Fix bad merge

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/slang_event.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c
index f3e9be8..0ef2014 100644
--- a/rgmanager/src/daemons/slang_event.c
+++ b/rgmanager/src/daemons/slang_event.c
@@ -992,7 +992,6 @@ sl_die(void)
 
 SLang_Intrin_Fun_Type rgmanager_slang[] =
 {
-<<<<<<< HEAD:rgmanager/src/daemons/slang_event.c
 	MAKE_INTRINSIC_0("nodes_online", sl_nodes_online, SLANG_VOID_TYPE),
 	MAKE_INTRINSIC_0("service_list", sl_service_list, SLANG_VOID_TYPE),
 
@@ -1002,21 +1001,6 @@ SLang_Intrin_Fun_Type rgmanager_slang[] =
 	MAKE_INTRINSIC_0("service_stop", sl_stop_service, SLANG_INT_TYPE),
 	MAKE_INTRINSIC_0("service_start", sl_start_service, SLANG_INT_TYPE),
 	MAKE_INTRINSIC_S("service_status", sl_service_status,
-=======
-	MAKE_INTRINSIC_0((char *)"nodes_online", sl_nodes_online,
-			 SLANG_VOID_TYPE),
-	MAKE_INTRINSIC_0((char *)"service_list", sl_service_list,
-			 SLANG_VOID_TYPE),
-	MAKE_INTRINSIC_SS((char *)"service_property", sl_service_property,
-			  SLANG_VOID_TYPE),
-	MAKE_INTRINSIC_S((char *)"service_domain_info", sl_domain_info,
-			 SLANG_VOID_TYPE),
-	MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service,
-			 SLANG_INT_TYPE),
-	MAKE_INTRINSIC_0((char *)"service_start", sl_start_service,
-			 SLANG_INT_TYPE),
-	MAKE_INTRINSIC_S((char *)"service_status", sl_service_status,
->>>>>>> f4f9663... rgmanager: Fix small memory leak:rgmanager/src/daemons/slang_event.c
 			 SLANG_VOID_TYPE),
 	MAKE_INTRINSIC_S("service_freeze", sl_service_freeze,
 			 SLANG_INT_TYPE),