Merge branch 'master' of /home/buczek/git/Portifix

Conflicts: src/de/mpg/molgen/buczek/portifix/Gui.java
donald · Oct 15, 2014 · c7f54d7 · c7f54d7
2 parents fd578a1 + cda05fd
commit c7f54d7
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/de/mpg/molgen/buczek/portifix/Gui.java b/src/de/mpg/molgen/buczek/portifix/Gui.java
@@ -124,15 +124,7 @@ private String join(String delim,String s1,String s2) {
             return s2;
         }
     }
-
-
-
-
-
-
-
-
-
+
     private void updateForm() {
 
         int selected[] = jTable1.getSelectedRows();