FIxed conflict

miguelnunes miguelnunes 2015-01-07

changed bundle/pom.xml
changed cli/pom.xml
changed src/main/java/net/timbusproject/extractors/debiansoftwareextractor/DebianSoftwareExtractor.java
changed src/main/java/net/timbusproject/extractors/debiansoftwareextractor/SSHManager.java
changed pom.xml
changed src/main/java/net/timbusproject/extractors/debiansoftwareextractor/DebianSoftwareExtractor.java
changed src/main/java/net/timbusproject/extractors/debiansoftwareextractor/SSHManager.java
bundle/pom.xml Diff Switch to side-by-side view
Loading...
cli/pom.xml Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/extractors/debiansoftwareextractor/DebianSoftwareExtractor.java Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/extractors/debiansoftwareextractor/SSHManager.java Diff Switch to side-by-side view
Loading...
pom.xml Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/extractors/debiansoftwareextractor/DebianSoftwareExtractor.java Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/extractors/debiansoftwareextractor/SSHManager.java Diff Switch to side-by-side view
Loading...