Fix path discard removing whole queried path

pizzalemon · Dec 10, 2022 · 2346815 · 2346815
1 parent 716a870
commit 2346815
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/server/apps/uav.py b/server/apps/uav.py
@@ -112,8 +112,6 @@ def uav_view_commands_file():
     return send_file("handlers/uav/uav_mission.txt")
 
 
-<<<<<<< HEAD:server/apps/uav.py
-<<<<<<< HEAD:server/apps/uav.py
 @uav_commands.route("/export")
 def uav_export_commands_file():
     waypoints = []