From: velho <velho@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 2 Mar 2007 12:33:30 +0000 (+0000)
Subject: Solved a bogus conflict detected by CVS. In other word this commit
X-Git-Tag: v3.3~2169
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e3327d30266f5bf58bd3e583a70d82ccbb4fae3b

Solved a bogus conflict detected by CVS. In other word this commit
changes nothing. Although keeps the repository in a consistent state.


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

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 07fccf280e..3513cd907c 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -73,8 +73,7 @@ void MSG_create_environment(const char *file) {
   DEBUG1("Model : %s", workstation_model_name);
   if (!strcmp(workstation_model_name,"KCCFLN05")) {
     surf_workstation_resource_init_KCCFLN05(file);
-  }
-  else if (!strcmp(workstation_model_name,"KCCFLN05_proportionnal")) {
+  }else if (!strcmp(workstation_model_name,"KCCFLN05_proportional")) {
     surf_workstation_resource_init_KCCFLN05_proportionnal(file);
   } else if (!strcmp(workstation_model_name,"CLM03")) {
     surf_workstation_resource_init_CLM03(file);