This is an automated email from the ASF dual-hosted git repository.
polandll pushed a commit to branch CASS-18231-CEP-7
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/CASS-18231-CEP-7 by this push:
new b3621317d2 remove conflict header
b3621317d2 is described below
commit b3621317d2cc07a8420db1b54537aa2d3ce28651
Author: Lorina Poland <lor...@datastax.com>
AuthorDate: Mon Sep 25 14:53:40 2023 -0700
remove conflict header
---
doc/modules/cassandra/nav.adoc | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/modules/cassandra/nav.adoc b/doc/modules/cassandra/nav.adoc
index 90120629f8..bacf5073db 100644
--- a/doc/modules/cassandra/nav.adoc
+++ b/doc/modules/cassandra/nav.adoc
@@ -112,4 +112,3 @@
**** xref:cassandra:reference/cql-commands/drop-index.adoc[]
** xref:cassandra:integrating/plugins/index.adoc[]
->>>>>>> 55fdbd6096 (Changes required to add SAI to the docs.)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
