Index: manager.c
===================================================================
--- manager.c	(revision 17068)
+++ manager.c	(working copy)
@@ -122,7 +122,7 @@
 	{ 0, "none" },
 };
 
-static struct mansession *sessions = NULL;
+struct mansession *sessions = NULL;
 
 static struct manager_action *first_action = NULL;
 AST_MUTEX_DEFINE_STATIC(actionlock);
@@ -526,8 +526,6 @@
 	{ { "show", "manager", "connected", NULL },
 	handle_showmanconn, "Show connected manager interface users", showmanconn_help };
 
-<<<<<<< .working
-
 static int handle_showmanager(int fd, int argc, char *argv[])
 {
 	struct ast_manager_user *tmp;
Index: include/asterisk/manager.h
===================================================================
--- include/asterisk/manager.h	(revision 17068)
+++ include/asterisk/manager.h	(working copy)
@@ -136,7 +136,7 @@
 	struct ast_manager_user *next;
 };
 
-static struct mansession {
+extern struct mansession {
 	/*! Execution thread */
 	pthread_t t;
 	/*! Thread lock -- don't use in action callbacks, it's already taken care of  */
@@ -180,7 +180,7 @@
 	/* Timeout for ast_carefulwrite() */
 	int writetimeout;
 	struct mansession *next;
-} *sessions = NULL;
+} *sessions;
 
 struct message {
 	int hdrcount;