[groovy] branch GROOVY_3_0_X updated: fix merge glitch

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new bacee81  fix merge glitch
bacee81 is described below

commit bacee81ed5fd112ffca466c3be83c8ed66bca1c0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Nov 20 09:00:22 2020 +1000

    fix merge glitch
---
 .../groovy/runtime/DefaultGroovyStaticMethods.java | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
index d09ee98..163cca4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
@@ -27,13 +27,10 @@ import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-<<<<<<< HEAD
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-=======
 import java.nio.file.Files;
 import java.nio.file.Path;
->>>>>>> bcbe5c4c76... GROOVY-9824: replace some old api usage with newer 
available variants (closes #1425)
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
@@ -111,11 +108,11 @@ public class DefaultGroovyStaticMethods {
     /**
      * Dump the thread dump of all threads
      *
-     * @param self    placeholder variable used by Groovy categories; ignored 
for default static methods
+     * @param self placeholder variable used by Groovy categories; ignored for 
default static methods
      * @return the thread dump of all threads
      * @since 3.0.0
      */
-    public static String dumpAll(Thread self){
+    public static String dumpAll(Thread self) {
         ThreadMXBean threadMxBean = ManagementFactory.getThreadMXBean();
         return Arrays.stream(threadMxBean.dumpAllThreads(true, true))
                 .map(ThreadInfo::toString)
@@ -257,12 +254,11 @@ public class DefaultGroovyStaticMethods {
     /**
      * Get the current time in seconds
      *
-     * @param self   placeholder variable used by Groovy categories; ignored 
for default static methods
-     * @return  the difference, measured in seconds, between
-     *          the current time and midnight, January 1, 1970 UTC.
-     * @see     System#currentTimeMillis()
+     * @param self placeholder variable used by Groovy categories; ignored for 
default static methods
+     * @return the difference, measured in seconds, between the current time 
and midnight, January 1, 1970 UTC.
+     * @see System#currentTimeMillis()
      */
-    public static long currentTimeSeconds(System self){
-    return System.currentTimeMillis() / 1000;
-  }
+    public static long currentTimeSeconds(System self) {
+        return System.currentTimeMillis() / 1000;
+    }
 }