stuff left over

README.md

@@ -83,4 +83,5 @@ This file contains the configuration for `Hugo`, `asciidoctor` and `sebi-theme`.
 
 ### Package.json
 
-This file contains the needed packages to be able to build the website.
+This file contains the needed packages to be able to build the website.
+

topics/code/simplejdbc/src/main/java/simplejdbc/PgJDBCUtils.java

@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.sql.DataSource;
 import org.postgresql.ds.PGSimpleDataSource;

topics/logging.adoc

@@ -16,13 +16,9 @@ public static void main( String[] args ) {
 
 <1> Create a specific logger for this class.
 <2> This log statement only does 'work' when the log level is set to FINE or higher (FINER, FINEST)
-<<<<<<< Updated upstream
 <3> Note the use of positional parameters in the format string. It can be quite useful. See it as a free and random tip.
-<4> This lambda has the shape of a supplier and is only evaluated or computed when the logging level is active.
-=======
-<3> This lambda has the shape of a supplier and is only evaluated or computed when the logging level is active. This 
+<4> The lambda has the shape of a supplier and is only evaluated or computed when the logging level is active. This 
 make logging 'cheap' when the log level is not active.
->>>>>>> Stashed changes
 
 === Replace `soutv`` by using a log macro