Update backend command routes and add route to generate mission file

pizzalemon · Dec 10, 2022 · 511c228 · 511c228
1 parent 22cc27f
commit 511c228
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/server/apps/uav.py b/server/apps/uav.py
@@ -112,6 +112,7 @@ def uav_view_commands_file():
     return send_file("handlers/uav/uav_mission.txt")
 
 
+<<<<<<< HEAD:server/apps/uav.py
 @uav_commands.route("/export")
 def uav_export_commands_file():
     waypoints = []
@@ -134,6 +135,8 @@ def uav_export_commands_file():
     return {"waypoints": waypoints}
 
 
+=======
+>>>>>>> bffcf3d (Update backend command routes and add route to generate mission file):server/app/uav.py
 @uav_commands.route("/generate", methods=["POST"])
 def uav_generate_commands_file():
     f = request.json