commit a200c5c0122aa7dc783e9a1b34dd25c72b04c4a2
author randgalt <randgalt@apache.org> Tue May 12 17:11:34 2015 -0500
committer Scott Blum <dragonsinth@apache.org> Wed Aug 12 17:30:27 2015 -0400
tree 6e8619c1a3f07e1ef2cc6e55846c9e2f3feeab6f
parent 8c8d7ec2ba24cf192db7cd0a738924a2ec538e09

fixed some merge issues

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java

diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
index cd3ae77..b25f46e 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
@@ -60,6 +60,7 @@
     {
         for ( CreateMode mode : CreateMode.values() )
         {
+            System.out.println(mode);
             internalTestPathsFromProtectingInBackground(mode);
         }
     }