Skip to content

Commit

Permalink
redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
@meejah
meejah committed Jun 11, 2024
1 parent 86cb478 commit be5b04f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/conflicts.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The history of these changes *is available* in the parent (or grandparent) Snaps
Resolving via Filesystem
------------------------

Not currently possible.
Not currently possible (see `https://github.com/tahoe-lafs/magic-folder/issues/754 <Issue 754>`_).


Resolving via the CLI
Expand Down

0 comments on commit be5b04f

Please sign in to comment.