From 55ea0201a8f6cd31127455d745b4839e4f8a3d62 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 27 Sep 2017 09:42:49 +0200 Subject: 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 --- .gitignore | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 .gitignore (limited to '.gitignore') 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 -- cgit 1.2.3-korg