aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
AgeCommit message (Collapse)AuthorFilesLines
2017-09-27Resolve merge failureDan Timoney1-0/+35
Add additional config to pom.xml to allow merge build (mvn deploy) to succeed. Change-Id: I42400c367a78f87a02cf80365fe1c58f069b713f Issue-ID: CCSDK-59 Signed-off-by: Dan Timoney <dtimoney@att.com>