From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 2 Dec 2010 17:19:03 +0000 (+0000)
Subject: Resolve a conflict
X-Git-Tag: v3.6_beta2~1001
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/29611f876b36be03e26c33879d0e1a72db6090f1

Resolve a conflict

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8913 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/simix/private.h b/src/simix/private.h
index 3ac7fd1ed8..068baf4bf4 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -274,7 +274,6 @@ static XBT_INLINE smx_context_t SIMIX_context_self(void)
   return (*(simix_global->context_factory->self))();
 }
 
-<<<<<<< HEAD
 /**
  \brief returns the data associated to a context
  \param context The context
@@ -285,7 +284,4 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(context);
 }
 
-
-=======
->>>>>>> Clean indentation and coding style in SIMIX
 #endif