remove merge markers
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4024605e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4024605e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4024605e Branch: refs/heads/trunk Commit: 4024605efa89118afa05aa4b46d17b18db0d1da3 Parents: 7dd87c1 Author: Dave Brosius <[email protected]> Authored: Wed Jan 16 19:34:44 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Wed Jan 16 19:34:44 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4024605e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d5c1c0c..d71fd28 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -48,11 +48,8 @@ Merged from 1.1: * Fix CQL3 BATCH authorization caching (CASSANDRA-5145) * fix get_count returns incorrect value with TTL (CASSANDRA-5099) * better handling for amid compaction failure (CASSANDRA-5137) -<<<<<<< HEAD -======= * calculate pending ranges asynchronously (CASSANDRA-5135) * convert default marshallers list to map for better readability (CASSANDRA-5109) ->>>>>>> cassandra-1.1 1.2.0
