Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2016-10-17 16:42:49 +05:30

parent 9cb69ca0e3 b40c0a917d

commit 395d757c5a

21 changed files with 738 additions and 195 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

erpnext/docs/assets/img/human-resources/bank-entry.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/human-resources/process-payroll.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 97 KiB After Width:  |  Height:  |  Size: 216 KiB

BIN

erpnext/docs/assets/img/human-resources/salary-structure-account.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/human-resources/salary-structure.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 231 KiB After Width:  |  Height:  |  Size: 413 KiB