Fix merge conflicts

BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java

@@ -17,7 +17,6 @@
  *     You should have received a copy of the GNU Affero General Public License
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- */
 
 package de.steamwar.bausystem.commands;