BISERVER-8101 - Added the functionality for determining event logic and conflicts
Merge pull request #154 from krivera-pentaho/dev

BISERVER-8101 - Added the functionality for determining event logic and ...