X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=doc%2Fhtml%2Fuser-guide%2Fpix%2Fconflictwin.png;fp=doc%2Fhtml%2Fuser-guide%2Fpix%2Fconflictwin.png;h=62eea1a3e11bfa01b3a3d69475e9e8167e47496c;hb=2b5bec7716c03d42cfb16d8c98c9cea573bf6722;hp=0000000000000000000000000000000000000000;hpb=47412fc4bd1aefc0d5498bcb3860a9d727196f16;p=karo-tx-redboot.git

diff --git a/doc/html/user-guide/pix/conflictwin.png b/doc/html/user-guide/pix/conflictwin.png
new file mode 100644
index 00000000..62eea1a3
Binary files /dev/null and b/doc/html/user-guide/pix/conflictwin.png differ