Skip to content

board_types: resolve conflicts #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

board_types: resolve conflicts #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions board_types.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ AP_HW_PixSurveyA-IND 1107
AP_HW_SPRACINGH7RF 1108
AP_HW_AEROFOX_GNSS_F9P 1109
AP_HW_JFB110 1110
<<<<<<< HEAD
AP_HW_NarinH7 1183
=======
AP_HW_SDMODELH7V1 1111
AP_HW_FlyingMoonH743 1112
AP_HW_YJUAV_A6 1113
Expand Down