[Swift-commit] r6676 - in branches/release-0.94/src: . org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-29 01:08:45 -0500 (Mon, 29 Jul 2013)
New Revision: 6676

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


Property changes on: branches/release-0.94/src
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/src:6673

Modified: branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java
===================================================================
--- branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-29 06:01:00 UTC (rev 6675)
+++ branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-29 06:08:45 UTC (rev 6676)
@@ -57,6 +57,7 @@
                 return dir;
             }
         }
+	return "";
     }
     
     static {