Merge branch 'dev_jkr' into 'master'

# Conflicts: # src/8008135.c
5 years ago · be224f55a6
parent 3e30a6df32 a598ee7319
commit be224f55a6
1 changed files with 0 additions and 1 deletions
--- a/src/8008135.c
+++ b/src/8008135.c
@ -23,7 +23,6 @@
 *******************************************************************************/
 #include "8008135.h"

-/*******************************************************************************/

 /***  FUNCTION  ****************************************************************
 *          NAME:  8008135_init