Commit 02610133 authored by Jan Kiene's avatar Jan Kiene
Browse files

remove merge leftover

parent 0e606f3b
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/
#define  NONBE_FIX_1054_NEGATIVE_LVQ_INDEX              /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */
>>>>>>> main

/* ##################### End NON-BE switches ########################### */