really fix conflicts in epa.cc

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8572 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/pbd/epa.cc b/libs/pbd/epa.cc
index a12dc961a94d176c7cac57c2c18640c9e7192db8..3b6066d9f198fc94ca7e7e94925a046e4ee4bef0 100644 (file)
--- a/libs/pbd/epa.cc
+++ b/libs/pbd/epa.cc
@@ -61,25 +61,17 @@ void
 EnvironmentalProtectionAgency::save ()
 {
        /* do this to avoid lots of calls to _NSGetEnviron() on OS X */
+
        char** the_environ = environ;
 
         e.clear ();
 
-<<<<<<< .mine
-        for (size_t i = 0; the_environ[i]; ++i) {
-=======
         if (!_envname.empty()) {
                 
                 /* fetch environment from named environment variable, rather than "environ"
                  */
->>>>>>> .r8570
 
-<<<<<<< .mine
-                string estring = the_environ[i];
-                string::size_type equal = estring.find_first_of ('=');
-=======
                 const char* estr = getenv (_envname.c_str());
->>>>>>> .r8570
 
                 if (!estr) {
                         return;
@@ -112,9 +104,9 @@ EnvironmentalProtectionAgency::save ()
                 /* fetch environment from "environ"
                  */
 
-                for (size_t i = 0; environ[i]; ++i) {
+                for (size_t i = 0; the_environ[i]; ++i) {
                         
-                        string estring = environ[i];
+                        string estring = the_environ[i];
                         string::size_type equal = estring.find_first_of ('=');
                         
                         if (equal == string::npos) {