From 06ece1c43df289c2fc3e934d4958113e40da740c Mon Sep 17 00:00:00 2001
From: mdn-bot <108879845+mdn-bot@users.noreply.github.com>
Date: Thu, 12 Sep 2024 01:30:02 +0000
Subject: [PATCH] ja: sync translated content

---
 files/ja/_redirects.txt                                        | 1 +
 .../web/css/grid-auto-flow}/index.md                           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename files/ja/{web/css/masonry-auto-flow => conflicting/web/css/grid-auto-flow}/index.md (97%)

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 0f8b46f52d6a90..113bdc593ef9b5 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3783,6 +3783,7 @@
 /ja/docs/Web/CSS/linear-gradient()	/ja/docs/Web/CSS/gradient/linear-gradient
 /ja/docs/Web/CSS/margin-new	/ja/docs/Web/CSS/margin
 /ja/docs/Web/CSS/margin_collapsing	/ja/docs/Web/CSS/CSS_box_model/Mastering_margin_collapsing
+/ja/docs/Web/CSS/masonry-auto-flow	/ja/docs/conflicting/Web/CSS/grid-auto-flow
 /ja/docs/Web/CSS/max()	/ja/docs/Web/CSS/max
 /ja/docs/Web/CSS/min()	/ja/docs/Web/CSS/min
 /ja/docs/Web/CSS/minmax()	/ja/docs/Web/CSS/minmax
diff --git a/files/ja/web/css/masonry-auto-flow/index.md b/files/ja/conflicting/web/css/grid-auto-flow/index.md
similarity index 97%
rename from files/ja/web/css/masonry-auto-flow/index.md
rename to files/ja/conflicting/web/css/grid-auto-flow/index.md
index 84e2e986e59def..0b640e931e8e30 100644
--- a/files/ja/web/css/masonry-auto-flow/index.md
+++ b/files/ja/conflicting/web/css/grid-auto-flow/index.md
@@ -1,6 +1,7 @@
 ---
 title: masonry-auto-flow
-slug: Web/CSS/masonry-auto-flow
+slug: conflicting/Web/CSS/grid-auto-flow
+original_slug: Web/CSS/masonry-auto-flow
 ---
 
 {{CSSRef}}