From 3a45eb13b77528d326f85a7664fa4cb2b6bde91a Mon Sep 17 00:00:00 2001
From: Christoph Tank <mail@christoph-tank.de>
Date: Tue, 15 Oct 2019 01:22:36 +0200
Subject: [PATCH] Merge branch 'master' of
 C:\Users\chris\IdeaProjects\BOS-Pinneberg with conflicts.

---
 include/funkrufkennziffer.php | 1 -
 include/thw.php               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/funkrufkennziffer.php b/include/funkrufkennziffer.php
index 20e6e48..ac946fe 100644
--- a/include/funkrufkennziffer.php
+++ b/include/funkrufkennziffer.php
@@ -83,5 +83,4 @@ if ($result->num_rows > 0) {
     echo("<h4>Rettungsdienstfahrzeuge</h4>");
     showTable($conn,9);
 
-
 } ?>
diff --git a/include/thw.php b/include/thw.php
index 89f55b0..cc12832 100644
--- a/include/thw.php
+++ b/include/thw.php
@@ -33,7 +33,7 @@ if ($result->num_rows > 0) {
 
                     <?php
 
-                    $fahrzeuge = $conn->query("SELECT * FROM `thw` WHERE OrtID = " . $row['id']);
+                    $fahrzeuge = $conn->query("SELECT * FROM `thw` WHERE OrtID = " . $row['id'] . " ORDER BY `einheit` ASC");
 
                     if ($fahrzeuge->num_rows > 0) {
                         while ($frow = $fahrzeuge->fetch_assoc()) {