summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAl <26797547+Al12rs@users.noreply.github.com>2020-01-15 11:59:13 +0100
committerGitHub <noreply@github.com>2020-01-15 11:59:13 +0100
commit5aad5eb8a23f319cfddb90b2a9b7e4121783af98 (patch)
treed13bc33a371f3c8ec364d899653c86b44da66650 /src/resources
parent0c2289b6f93bf34fcc28a720587276dfbedd0e85 (diff)
parentf65121b8bc93f7d55f8457e41ad9968940746d11 (diff)
Merge pull request #970 from Al12rs/hidden-files-flag
Hidden files flag
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/conflict-hidden.pngbin0 -> 231 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-hidden.png b/src/resources/conflict-hidden.png
new file mode 100644
index 00000000..84a5da98
--- /dev/null
+++ b/src/resources/conflict-hidden.png
Binary files differ