style fix

uwescience · Aug 30, 2017 · 56387db · 56387db
1 parent 6611add
commit 56387db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/edu/washington/escience/myria/util/MyriaUtils.java b/src/edu/washington/escience/myria/util/MyriaUtils.java
@@ -168,7 +168,7 @@ public static ByteBuffer getBlob(final String filename) {
   }
 
   /**
-<<<<<<< HEAD
+   * <<<<<<< HEAD
    * casts blob v to an int
    * @param v the blob to cast
    * @return the value inside of the blob as an int
@@ -199,7 +199,7 @@ public static long castBlobToLong(ByteBuffer v) throws IndexOutOfBoundsException
     }
   }
 
-   /** 
+  /**
    * This function replaces the `s3` scheme with the `s3a` scheme,
    * to force use of the new S3A Hadoop filesystem.
    * @param uri input URI