Fixing conflict between #46 and #48 by merging both into dev, and manually resolving the conflicts.
@tbrand Is there a better way for this?
By the way, you should be more active, please take a look at this repository when you work on your projects, or turn on automatic notifications.
Fixing conflict between #46 and #48 by merging both into
dev
, and manually resolving the conflicts. @tbrand Is there a better way for this? By the way, you should be more active, please take a look at this repository when you work on your projects, or turn on automatic notifications.