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