Skip to content

Commit

Permalink
merge conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@estelle
estelle committed Feb 12, 2025
2 parents e68d24b + 594eb75 commit cb02922
Show file tree
Hide file tree
Showing 104 changed files with 388 additions and 353 deletions.
28 changes: 21 additions & 7 deletions files/en-us/_redirects.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@
/en-US/docs/CSS/Using_CSS_multiple_backgrounds /en-US/docs/Web/CSS/CSS_backgrounds_and_borders/Using_multiple_backgrounds
/en-US/docs/CSS/Using_CSS_transforms /en-US/docs/Web/CSS/CSS_transforms/Using_CSS_transforms
/en-US/docs/CSS/Using_CSS_transitions /en-US/docs/Web/CSS/CSS_transitions/Using_CSS_transitions
/en-US/docs/CSS/Using_CSS_variables /en-US/docs/Web/CSS/Using_CSS_custom_properties
/en-US/docs/CSS/Using_CSS_variables /en-US/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties
/en-US/docs/CSS/Using_media_queries_from_code /en-US/docs/Web/CSS/CSS_media_queries/Testing_media_queries
/en-US/docs/CSS/Using_the_CSS_multi-column_layout /en-US/docs/Web/CSS/CSS_multicol_layout/Using_multicol_layouts
/en-US/docs/CSS/Value_definition_syntax /en-US/docs/Web/CSS/Value_definition_syntax
Expand Down Expand Up @@ -11811,7 +11811,7 @@
/en-US/docs/Web/CSS/Adjacent_sibling_combinator /en-US/docs/Web/CSS/Next-sibling_combinator
/en-US/docs/Web/CSS/Adjacent_sibling_selectors /en-US/docs/Web/CSS/Next-sibling_combinator
/en-US/docs/Web/CSS/Alias /en-US/docs/Web/CSS/cursor
/en-US/docs/Web/CSS/All_About_The_Containing_Block /en-US/docs/Web/CSS/Containing_block
/en-US/docs/Web/CSS/All_About_The_Containing_Block /en-US/docs/Web/CSS/CSS_display/Containing_block
/en-US/docs/Web/CSS/Aural /en-US/docs/Web/CSS/@media/aural
/en-US/docs/Web/CSS/Block_formatting_context /en-US/docs/Web/CSS/CSS_display/Block_formatting_context
/en-US/docs/Web/CSS/CSS3_Columns /en-US/docs/Web/CSS/CSS_multicol_layout/Using_multicol_layouts
Expand Down Expand Up @@ -11845,8 +11845,8 @@
/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Mixins /en-US/docs/Glossary/Flexbox
/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes /en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox
/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications /en-US/docs/Web/CSS/CSS_flexible_box_layout/Typical_use_cases_of_flexbox
/en-US/docs/Web/CSS/CSS_Flow_Layout/Formatting_Contexts_Explained /en-US/docs/Web/CSS/CSS_flow_layout/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_Flow_Layout/Intro_to_formatting_contexts /en-US/docs/Web/CSS/CSS_flow_layout/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_Flow_Layout/Formatting_Contexts_Explained /en-US/docs/Web/CSS/CSS_display/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_Flow_Layout/Intro_to_formatting_contexts /en-US/docs/Web/CSS/CSS_display/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_Functionals /en-US/docs/Web/CSS/CSS_Functions
/en-US/docs/Web/CSS/CSS_Grid /en-US/docs/Web/CSS/CSS_grid_layout
/en-US/docs/Web/CSS/CSS_Grid_Layout/Auto-placement_in_CSS_Grid_Layout /en-US/docs/Web/CSS/CSS_grid_layout/Auto-placement_in_grid_layout
Expand Down Expand Up @@ -11917,8 +11917,19 @@
/en-US/docs/Web/CSS/CSS_charsets /en-US/docs/Web/CSS/CSS_syntax
/en-US/docs/Web/CSS/CSS_container_queries /en-US/docs/Web/CSS/CSS_containment/Container_queries
/en-US/docs/Web/CSS/CSS_descriptor_definition /en-US/docs/Web/CSS
/en-US/docs/Web/CSS/CSS_display/flow_layout/Block_and_inline_layout_in_normal_flow /en-US/docs/Web/CSS/CSS_display/Block_and_inline_layout_in_normal_flow
/en-US/docs/Web/CSS/CSS_display/flow_layout/Flow_layout_and_overflow /en-US/docs/Web/CSS/CSS_display/Flow_layout_and_overflow
/en-US/docs/Web/CSS/CSS_display/flow_layout/Flow_layout_and_writing_modes /en-US/docs/Web/CSS/CSS_display/Flow_layout_and_writing_modes
/en-US/docs/Web/CSS/CSS_display/flow_layout/In_flow_and_out_of_flow /en-US/docs/Web/CSS/CSS_display/In_flow_and_out_of_flow
/en-US/docs/Web/CSS/CSS_display/flow_layout/Introduction_to_formatting_contexts /en-US/docs/Web/CSS/CSS_display/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_flex-wrap /en-US/docs/Web/CSS/flex-wrap
/en-US/docs/Web/CSS/CSS_flexible_box_layout/Backwards_compatibility_of_flexbox /en-US/docs/Glossary/Flexbox
/en-US/docs/Web/CSS/CSS_flow_layout /en-US/docs/Web/CSS/CSS_display/flow_layout
/en-US/docs/Web/CSS/CSS_flow_layout/Block_and_inline_layout_in_normal_flow /en-US/docs/Web/CSS/CSS_display/Block_and_inline_layout_in_normal_flow
/en-US/docs/Web/CSS/CSS_flow_layout/Flow_layout_and_overflow /en-US/docs/Web/CSS/CSS_display/Flow_layout_and_overflow
/en-US/docs/Web/CSS/CSS_flow_layout/Flow_layout_and_writing_modes /en-US/docs/Web/CSS/CSS_display/Flow_layout_and_writing_modes
/en-US/docs/Web/CSS/CSS_flow_layout/In_flow_and_out_of_flow /en-US/docs/Web/CSS/CSS_display/In_flow_and_out_of_flow
/en-US/docs/Web/CSS/CSS_flow_layout/Introduction_to_formatting_contexts /en-US/docs/Web/CSS/CSS_display/Introduction_to_formatting_contexts
/en-US/docs/Web/CSS/CSS_grid_layout/Grid_layout_and_progressive_enhancement /en-US/docs/Web/CSS/CSS_grid_layout
/en-US/docs/Web/CSS/CSS_grid_layout/Layout_using_line-based_placement /en-US/docs/Web/CSS/CSS_grid_layout/Grid_layout_using_line-based_placement
/en-US/docs/Web/CSS/CSS_grid_layout/Layout_using_named_grid_lines /en-US/docs/Web/CSS/CSS_grid_layout/Grid_layout_using_named_grid_lines
Expand All @@ -11933,6 +11944,7 @@
/en-US/docs/Web/CSS/Child_selectors /en-US/docs/Web/CSS/Child_combinator
/en-US/docs/Web/CSS/Common_CSS_Questions /en-US/docs/Learn_web_development/Howto/Solve_CSS_problems/CSS_FAQ
/en-US/docs/Web/CSS/Compositing_and_Blending /en-US/docs/Web/CSS/CSS_compositing_and_blending
/en-US/docs/Web/CSS/Containing_block /en-US/docs/Web/CSS/CSS_display/Containing_block
/en-US/docs/Web/CSS/Currentcolor /en-US/docs/Web/CSS/color_value#currentcolor_keyword
/en-US/docs/Web/CSS/Descendant_selectors /en-US/docs/Web/CSS/Descendant_combinator
/en-US/docs/Web/CSS/Draft_Implementations_of_CSS_Features /en-US/docs/Web/CSS/Mozilla_Extensions
Expand Down Expand Up @@ -11975,8 +11987,9 @@
/en-US/docs/Web/CSS/Understanding_CSS_z-index/Stacking_without_z-index /en-US/docs/Web/CSS/CSS_positioned_layout/Understanding_z-index/Stacking_without_z-index
/en-US/docs/Web/CSS/Understanding_CSS_z-index/The_stacking_context /en-US/docs/Web/CSS/CSS_positioned_layout/Understanding_z-index/Stacking_context
/en-US/docs/Web/CSS/Using_CSS_Columns /en-US/docs/Web/CSS/CSS_multicol_layout/Using_multicol_layouts
/en-US/docs/Web/CSS/Using_CSS_custom_properties /en-US/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties
/en-US/docs/Web/CSS/Using_CSS_media_queries /en-US/docs/Web/CSS/CSS_media_queries/Using_media_queries
/en-US/docs/Web/CSS/Using_CSS_variables /en-US/docs/Web/CSS/Using_CSS_custom_properties
/en-US/docs/Web/CSS/Using_CSS_variables /en-US/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties
/en-US/docs/Web/CSS/Using_media_queries_from_code /en-US/docs/Web/CSS/CSS_media_queries/Testing_media_queries
/en-US/docs/Web/CSS/Using_the_CSS_multi-column_layout /en-US/docs/Web/CSS/CSS_multicol_layout/Using_multicol_layouts
/en-US/docs/Web/CSS/_image /en-US/docs/Web/CSS/image/image
Expand Down Expand Up @@ -12021,8 +12034,9 @@
/en-US/docs/Web/CSS/counters() /en-US/docs/Web/CSS/counters
/en-US/docs/Web/CSS/cross-fade() /en-US/docs/Web/CSS/cross-fade
/en-US/docs/Web/CSS/default /en-US/docs/Web/CSS/:default
/en-US/docs/Web/CSS/display/multi-value_syntax_of_display /en-US/docs/Web/CSS/display/multi-keyword_syntax_of_display
/en-US/docs/Web/CSS/display/two-value_syntax_of_display /en-US/docs/Web/CSS/display/multi-keyword_syntax_of_display
/en-US/docs/Web/CSS/display/multi-keyword_syntax_of_display /en-US/docs/Web/CSS/CSS_display/multi-keyword_syntax_of_display
/en-US/docs/Web/CSS/display/multi-value_syntax_of_display /en-US/docs/Web/CSS/CSS_display/multi-keyword_syntax_of_display
/en-US/docs/Web/CSS/display/two-value_syntax_of_display /en-US/docs/Web/CSS/CSS_display/multi-keyword_syntax_of_display
/en-US/docs/Web/CSS/document /en-US/docs/Web/CSS/@document
/en-US/docs/Web/CSS/document/@-moz-document /en-US/docs/Web/CSS/@document
/en-US/docs/Web/CSS/element() /en-US/docs/Web/CSS/element
Expand Down
Loading

0 comments on commit cb02922

Please sign in to comment.