- forgot to resolve merging conflicts in GmmlPropertyTable
- forgot to resolve merging conflicts in GmmlPropertyTable

PathVisio/pathvisio,markwoon/pathvisio,markwoon/pathvisio,PathVisio/pathvisio,PathVisio/pathvisio,markwoon/pathvisio,markwoon/pathvisio,PathVisio/pathvisio