GitHub user amandamoran opened a pull request:
https://github.com/apache/incubator-trafodion/pull/412
Fixing merge error
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/amandamoran/incubator-trafodion
installbugfixes
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-trafodion/pull/412.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 #412
----
commit ddd5fa0c8b60699a0957cd1cfa40129a0bee90a9
Author: Amanda Moran <[email protected]>
Date: 2016-04-04T17:17:22Z
Fixing merge error
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
