[Swift-commit] r6675 - branches/release-0.94/src/org/griphyn/vdl/karajan/lib

hategan at ci.uchicago.edu hategan at ci.uchicago.edu
Mon Jul 29 01:01:01 CDT 2013


Author: hategan
Date: 2013-07-29 01:01:00 -0500 (Mon, 29 Jul 2013)
New Revision: 6675

Modified:
   branches/release-0.94/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java
Log:
fixed merge problem

Modified: branches/release-0.94/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java
===================================================================
--- branches/release-0.94/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java	2013-07-29 05:58:47 UTC (rev 6674)
+++ branches/release-0.94/src/org/griphyn/vdl/karajan/lib/OutFileDirs.java	2013-07-29 06:01:00 UTC (rev 6675)
@@ -62,7 +62,7 @@
                     	}
                     }
                     else {
-                        ret.add(af.getHost() + "/" + dir);
+                        ret.append(af.getHost() + "/" + dir);
                     }
                 }
             }




More information about the Swift-commit mailing list