| Chunk |
|---|
| Conflicting content |
|---|
package org.cloudname.zk; <<<<<<< HEAD import org.apache.zookeeper.data.ACL; ======= >>>>>>> 7e628eba601a17e15ec3b1b6073c5e5b19d04fe6 import org.cloudname.*; import org.apache.zookeeper.WatchedEvent; |
| Solution content |
|---|
package org.cloudname.zk; import org.cloudname.*; import org.apache.zookeeper.WatchedEvent; |
| File |
|---|
| ZkCloudname.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |