merged
This commit is contained in:
parent
655f9021e6
commit
53d707f5ef
@ -10,7 +10,11 @@
|
||||
|
||||
|
||||
|
||||
<<<<<<< local
|
||||
volatile float U_des = 12.0;
|
||||
=======
|
||||
volatile float u_des = 14.0;
|
||||
>>>>>>> other
|
||||
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user