hope to resolve merge conflicts in screen shots

This commit is contained in:
ddeyo 2018-11-07 12:44:14 -08:00
parent af7263876d
commit 6e9354b38b
2 changed files with 0 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 136 KiB