[PR #1198] [MERGED] fix: conflict in fr-FR file #4588

New issue

Closed

opened 2026-03-23 21:38:28 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 21:38:28 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/1198
Author: @appflowy
Created: 10/1/2022
Status: ✅ Merged
Merged: 10/1/2022
Merged by: @appflowy

Base: main ← Head: fix/fr_FR_conflict

📝 Commits (1)

4894361 fix: conflict in fr-FR file

📊 Changes

1 file changed (+0 additions, -57 deletions)

View changed files

📝 frontend/app_flowy/assets/translations/fr-FR.json (+0 -57)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/1198 **Author:** [@appflowy](https://github.com/appflowy) **Created:** 10/1/2022 **Status:** ✅ Merged **Merged:** 10/1/2022 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `fix/fr_FR_conflict` --- ### 📝 Commits (1) - [`4894361`](https://github.com/AppFlowy-IO/AppFlowy/commit/4894361076837ecd8a585eb2ef3dfda8f64d3913) fix: conflict in fr-FR file ### 📊 Changes **1 file changed** (+0 additions, -57 deletions) <details> <summary>View changed files</summary> 📝 `frontend/app_flowy/assets/translations/fr-FR.json` (+0 -57) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>