Skip to content

Commit

Permalink
Match safety order from master
Browse files Browse the repository at this point in the history
This will cause a merge conflict with the tesla branch.
  • Loading branch information
appleguru committed Aug 2, 2018
1 parent aafbe05 commit f9a46e3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions board/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// ********************* includes *********************

#include "libc.h"
#include "safety.h"
#include "provision.h"

#include "drivers/drivers.h"
Expand All @@ -14,12 +15,11 @@
#include "drivers/uart.h"
#include "drivers/adc.h"
#include "drivers/usb.h"
#include "drivers/gmlan_alt.h"
#include "drivers/can.h"
#include "drivers/spi.h"
#include "drivers/timer.h"

#include "drivers/gmlan_alt.h"
#include "safety.h"
#include "drivers/can.h"

// ***************************** fan *****************************

Expand Down

0 comments on commit f9a46e3

Please sign in to comment.