Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 6 insertions, 7 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
index 77ec9dd..a30c5f8 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
@@ -21,14 +21,13 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.common;
 
 import java.io.InputStream;
 
 /**
  * Encapsulates binary content.
- * 
+ *
  * @author Patrick Peck
  * @author Stephan Grill
  * @version $Id$
@@ -36,10 +35,10 @@ import java.io.InputStream;
 public interface ContentBinary extends Content {
   /**
    * Get the binary content.
-   * 
-   * @return An <code>InputStream</code> from which the binary content can
-   * be read.
+   *
+   * @return An <code>InputStream</code> from which the binary content can be
+   *         read.
    */
-  public InputStream getBinaryContent();
-  
+  InputStream getBinaryContent();
+
 }