Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 16:58:48 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

merge error fixed

Browse Source
This commit is contained in:
Christophe De Wagter
2010-12-06 22:56:44 +01:00
parent f25637d753
commit a18ff9273c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/TUDelft/MicrojetBR.xml
-4
View File
@@ -1,10 +1,6 @@
<!DOCTYPE airframe SYSTEM "../airframe.dtd">
<<<<<<< HEAD
<airframe name="Microjet BR Tiny 1.1">
=======
<airframe name="Microjet BDW Tiny 1.1">
>>>>>>> a4d3b4c95367a2e3ab2e21ebb81c7e7dc530d6ac
<!-- commands section -->
<servos>