Edit to avoid conflict

Branch: Deleted repository:MAW016/edit-to-avoid-conflict-1384720614469

Branch: MAW016/holographlibrary:master

Merged

#2 · Created 2013-11-17 · Last updated 2013-11-17

Merged pull request

Merged in MAW016/holographlibrary-1/MAW016/edit-to-avoid-conflict-1384720614469 (pull request #2)

f8ca5c5·Author: David Martiník·Closed by: David Martiník·2013-11-17

Edit to avoid conflict