Fixing conflict

Browse Source

...

This commit is contained in:

LizRoss

2017-02-10 08:53:43 -08:00

parent 8caa0222de b891765b3f

commit 03dcad310b

47 changed files with 581 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

windows/manage/images/uc-01.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 56 KiB

BIN

windows/manage/images/uc-02.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 642 KiB

BIN

windows/manage/images/uc-02a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.3 KiB

BIN

windows/manage/images/uc-03.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 796 KiB

BIN

windows/manage/images/uc-03a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

windows/manage/images/uc-04.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 150 KiB

BIN

windows/manage/images/uc-04a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 50 KiB

BIN

windows/manage/images/uc-05.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 135 KiB

BIN

windows/manage/images/uc-05a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 30 KiB

BIN

windows/manage/images/uc-06.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 110 KiB

BIN

windows/manage/images/uc-06a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 51 KiB

BIN

windows/manage/images/uc-07.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 120 KiB

BIN

windows/manage/images/uc-07a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 29 KiB

BIN

windows/manage/images/uc-08.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 345 KiB

BIN

windows/manage/images/uc-08a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

windows/manage/images/uc-09.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 68 KiB

BIN

windows/manage/images/uc-09a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 47 KiB

BIN

windows/manage/images/uc-10.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 168 KiB

BIN

windows/manage/images/uc-10a.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 47 KiB

BIN

windows/manage/images/uc-11.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 32 KiB

BIN

windows/manage/images/uc-12.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 32 KiB

BIN

windows/manage/images/uc-13.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

windows/manage/images/uc-14.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 76 KiB

BIN

windows/manage/images/uc-15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

windows/manage/images/uc-16.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 51 KiB

BIN

windows/manage/images/uc-17.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

windows/manage/images/uc-18.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

windows/manage/images/uc-19.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

windows/manage/images/uc-20.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

windows/manage/images/uc-21.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

windows/manage/images/uc-22.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

windows/manage/images/uc-23.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

windows/manage/images/uc-24.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 21 KiB

BIN

windows/manage/images/uc-25.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 68 KiB