Fixed merge conflicts

Former-commit-id: 64182608dd121fd22aded543552d857009cf7af9
2026-04-30 20:24:32 +02:00 · 2014-01-31 21:52:08 -05:00
parent 09308083a9 ca44e3062e
commit c2c9db66e2
2 changed files with 1 additions and 2 deletions
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
@@ -138,6 +138,7 @@ public class AssemblyAnalyzer extends AbstractAnalyzer {
                dependency.getProductEvidence().addEvidence(new Evidence("grokassembly", "product",
                        product, Confidence.HIGH));
            }
+
        } catch (IOException ioe) {
            throw new AnalysisException(ioe);
        } catch (SAXException saxe) {