github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 10:32:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

corrected remaining merge conflicts that were missed earlier as they were in comments

Browse Source
This commit is contained in:
Jeremy Long
2016-06-06 06:45:33 -04:00
parent 6fd831e688
commit 7909bbbbe9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
View File

@@ -69,7 +69,7 @@ public class CveDB {
private ResourceBundle statementBundle = null; private ResourceBundle statementBundle = null;
/** /**
* <<<<<<< HEAD Creates a new CveDB object and opens the database * Creates a new CveDB object and opens the database
* connection. Note, the connection must be closed by the caller by calling * connection. Note, the connection must be closed by the caller by calling
* the close method. ======= Does the underlying connection support batch * the close method. ======= Does the underlying connection support batch
* operations? * operations?
@@ -79,7 +79,6 @@ public class CveDB {
/** /**
* Creates a new CveDB object and opens the database connection. Note, the * Creates a new CveDB object and opens the database connection. Note, the
* connection must be closed by the caller by calling the close method. * connection must be closed by the caller by calling the close method.
* >>>>>>> e79da72711dc0f326fcdce52deab89e37c0d8230
* *
* @throws DatabaseException thrown if there is an exception opening the * @throws DatabaseException thrown if there is an exception opening the
* database. * database.