Github user madrob commented on a diff in the pull request:
https://github.com/apache/curator/pull/77#discussion_r30155941
--- Diff: curator-framework/src/site/confluence/index.confluence ---
@@ -42,11 +42,16 @@ h3. Methods
|getData()|Begins an operation to get a ZNode's data. Call additional
methods (watch, background or get stat) and finalize the operation by calling
forPath()|
|setData()|Begins an operation to set a ZNode's data. Call additional
methods (version or background) and finalize the operation by calling forPath()|
|getChildren()|Begins an operation to get a ZNode's list of children
ZNodes. Call additional methods (watch, background or get stat) and finalize
the operation by calling forPath()|
+<<<<<<< HEAD
--- End diff --
Merge conflict needs to be resolved.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
