This is an automated email from the ASF dual-hosted git repository. mattmann pushed a commit to branch gsoc18 in repository https://gitbox.apache.org/repos/asf/drat.git
commit 50fe6ee19b3fdc7cb97bc08ecf46eec28be9a94b Merge: b0a7829 27d50f4 Author: Chris Mattmann <[email protected]> AuthorDate: Tue Aug 14 06:50:47 2018 -0700 merge conflict. distribution/src/main/resources/bin/dratstats.py | 204 +++------------------ nohup.out | 3 + .../src/main/webapp/resources/public/logo.png | Bin 102270 -> 39212 bytes .../src/main/webapp/resources/src/App.vue | 2 +- .../resources/src/components/auditsummarycomp.vue | 4 +- .../src/main/webapp/resources/src/logo.png | Bin 102270 -> 39212 bytes 6 files changed, 33 insertions(+), 180 deletions(-)
