Fixing wrong information in the dealing with conflicts section

opengisch · Jan 15, 2025 · 33f4965 · 33f4965
1 parent ad17064
commit 33f4965
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/documentation/assets/images/resolving_conflicts.gif b/documentation/assets/images/resolving_conflicts.gif
diff --git a/documentation/assets/images/resolving_conflicts.webp b/documentation/assets/images/resolving_conflicts.webp
diff --git a/documentation/reference/qfieldcloud/conflicts.en.md b/documentation/reference/qfieldcloud/conflicts.en.md
@@ -27,9 +27,9 @@ While highly unlikely have conflicts, preventing, mitigating and resolving confl
 
 - When dealing with conflicts:
    - Navigate to the "Changes" section.
-   - Filter the changes with the "Not_applied" status.
+   - Filter the changes with the "Conflict" status.
    - For each conflicted change, select it and set the status to "Re-apply" from the "Action" dropdown menu, alternatively if all the new changes are in conflict you can choose in the last conflicted change and select "Re-apply this and newer changes".
    - Check the details of changes in the conflict and click "Save All" at the end of the page.
    - Refer to our official documentation [Delta apply](https://docs.qfield.org/reference/qfieldcloud/jobs/#delta-apply-delta_apply-job) for additional information.
 
-!![](../../assets/images/resolving_conflicts.gif)
+!![](../../assets/images/resolving_conflicts.webp)