diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-09-27 09:42:49 +0200 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-09-27 09:42:55 +0200 |
| commit | 55ea0201a8f6cd31127455d745b4839e4f8a3d62 (patch) | |
| tree | 9c366ce96894a66a54e312f17d04be3d47638e9b /.gitignore | |
| parent | 4252fa64fcfb5c9a3549c1affe49c11e62e89a4c (diff) | |
Resolve merge failure
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>
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..7c9cc13 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ +#####standard .git ignore entries##### + +## IDE Specific Files ## +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +.checkstyle +maven-eclipse.xml +workspace + +## Compilation Files ## +*.class +**/target +target +target-ide +MANIFEST.MF + +## Misc Ignores (OS specific etc) ## +bin/ +dist +*~ +*.ipr +*.iml +*.iws +classes +out/ +.DS_STORE +.metadata + +# BlackDuck generated file +blackDuckHubProjectName.txt +blackDuckHubProjectVersionName.txt |