fix

xiph · Dec 20, 2023 · 289fcab · 289fcab
1 parent f5b8e52
commit 289fcab
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/opus_demo.c b/src/opus_demo.c
@@ -690,14 +690,11 @@ int main(int argc, char *argv[])
        {
           opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(dred_duration));
        }
-<<<<<<< HEAD
-=======
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
         /* force encoder to use SILK for the time being */
         opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY));
 #endif
->>>>>>> 895fb562 (osce enabled by default, dec_complexity=10)
     }
     if (!encode_only)
     {