Skip to content

Commit 0dcaefc

Browse files
Msksgmcijothomas
authored andcommitted
[ja] fix drift of content/ja/docs/demo/feature-flags (#6527)
1 parent 2e11966 commit 0dcaefc

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

content/ja/docs/demo/feature-flags.md

-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ aliases:
44
- feature_flags
55
- services/feature-flag
66
- services/featureflagservice
7-
<<<<<<< HEAD
87
default_lang_commit: ea3b23ce16243364ae03d368d49af870454f686f
9-
=======
10-
default_lang_commit: 24146bd1368e4c6082c7d6077efd29dba0d51055
11-
drifted_from_default: true
12-
>>>>>>> 7ba99afb (Results from /fix:all)
138
cSpell:ignore: OLJCESPC7Z
149
---
1510

0 commit comments

Comments
 (0)