resolve merge conflict

cadence-workflow · Jun 9, 2018 · cf9fdc2 · cf9fdc2
1 parent 927bd9d
commit cf9fdc2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.gen/go/admin/idl.go b/.gen/go/admin/idl.go