Skip to content
Commit 420f5554 authored by Arseniy Seroka's avatar Arseniy Seroka
Browse files

Merge pull request #12167 from jgillich/fish-merge-fix 

fish: fix merge conflict
parents ce8c8f1e 5e5ecb7b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment