GitHub user ludongfang opened a pull request:
https://github.com/apache/incubator-griffin/pull/369
Remove duplicate jackson annotation
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ludongfang/incubator-griffin master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-griffin/pull/369.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #369
----
commit a2296701e2b907abc51cf3e884d6c85223b8a76c
Author: louise <ayludongfang@...>
Date: 2018-04-25T07:37:55Z
fix doc
commit 390d5203f78350e8ac5a35fcaf8b99ad1b43aaf4
Author: DongfangLu <donlu@...>
Date: 2018-07-23T02:19:49Z
remove duplicated annotations
commit d3d2b012270085adeab39fc93a22e51c62b09e1a
Author: DongfangLu <donlu@...>
Date: 2018-07-23T02:23:30Z
Merge branch 'master' of https://github.com/apache/incubator-griffin
commit e4071b795c5f5d3d7d8d5efd2a1c1443c2cb8db6
Author: DongfangLu <donlu@...>
Date: 2018-07-23T02:33:05Z
fix conflicts
----
---