[clean]fix conflict

Author: HokutoMorita

build.gradle

@@ -16,7 +16,7 @@ group = "io.trocco"
 description = "Bigquery output for embulk"
 
 version = {
-    def baseVersion = "0.0.22"
+    def baseVersion = "0.1.0"
     def vd = versionDetails()
     if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) {
         baseVersion

src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java

@@ -109,7 +109,7 @@ public static void convertAndSet(ObjectNode node, String name, String src, Bigqu
                 }
                 break;
             case NUMERIC:
-                // BigQuery NUMERIC型のスケール最大値が9なのでデフォルト値を9にする
+                // Default value: 9, BigQuery NUMERIC type has a maximum scale of 9
                 int scale = columnOption != null ? columnOption.getScale() : 9;
                 node.put(name, new BigDecimal(src).setScale(scale, BigDecimal.ROUND_CEILING));
                 break;