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, 28 insertions, 28 deletions

diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCEntry.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCEntry.java
index 7c026cf..f0a9edd 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCEntry.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/api/ASiCEntry.java
@@ -7,32 +7,32 @@ import java.io.InputStream;
  */
 public class ASiCEntry {
 
-    private String entryName;
-    private InputStream contents;
-
-    public ASiCEntry() {
-    }
-
-    public String getEntryName() {
-        return entryName;
-    }
-
-    public void setEntryName(String entryName) {
-        this.entryName = entryName;
-    }
-
-    public InputStream getContents() {
-        return contents;
-    }
-
-    public void setContents(InputStream contents) {
-        this.contents = contents;
-    }
-
-    @Override
-    public String toString() {
-        return "ASiCEntry{" +
-                "entryName='" + entryName + '\'' +
-                '}';
-    }
+  private String entryName;
+  private InputStream contents;
+
+  public ASiCEntry() {
+  }
+
+  public String getEntryName() {
+    return entryName;
+  }
+
+  public void setEntryName(String entryName) {
+    this.entryName = entryName;
+  }
+
+  public InputStream getContents() {
+    return contents;
+  }
+
+  public void setContents(InputStream contents) {
+    this.contents = contents;
+  }
+
+  @Override
+  public String toString() {
+    return "ASiCEntry{" +
+        "entryName='" + entryName + '\'' +
+        '}';
+  }
 }