smiklosovic commented on code in PR #2062: URL: https://github.com/apache/cassandra/pull/2062#discussion_r1083767051
########## doc/modules/cassandra/pages/architecture/guarantees.adoc: ########## @@ -1,17 +1,21 @@ = Guarantees Apache Cassandra is a highly scalable and reliable database. Cassandra -is used in web based applications that serve large number of clients and +<<<<<<< HEAD Review Comment: @neshkeev this seems like conflicts were not resolved properly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
