doc/rados: remove git tag in placement-groups in q

Remove a merge conflict tag that was left in the Quincy branch as of
commit e3a39c213fc2c666450da05aa320751cf49f58b9. This is a cleanup of a
previous backport.

Signed-off-by: Zac Dover <zac.dover@proton.me>

diff --git a/doc/rados/operations/placement-groups.rst b/doc/rados/operations/placement-groups.rst
index f0ff9d87e20378551b71c1f4fa0ed5b133f21843..ff9865743535f34054ed49e20e8d850a86589c55 100644 (file)
--- a/doc/rados/operations/placement-groups.rst
+++ b/doc/rados/operations/placement-groups.rst
@@ -173,8 +173,6 @@ The output will resemble the following::
    This intervention will result in a small amount of backfill, but
    typically this traffic completes quickly.
 
->>>>>>> d6e1116d0df (doc/rados: edit placement-groups.rst (1 of x))
-
 Automated scaling
 -----------------