Credit Andrew for DVD BFF interlace+ mods and Andrea for bld_appimage fix

[goodguy/cinelerra.git] / cinelerra-5.1 / msg / txt

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index bf7794b37f6816a5eb7d4809bb285b8663718cbf..af97ee55e5ecd5fba4287ce314d23e72458dcdd7 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,11 +3,8 @@ For usage help, refer to the following:
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .
-<<<<<<< HEAD
 2023 April changes of note:
   X264 has been upgraded to r3106 stable release. 
-=======
->>>>>>> 3a4fc0d9ea25818f9de852a0a7e3eab22ceaaebd
 2023 March changes of note:
   Flac has been upgraded to 1.4.2
   Tiff has been upgraded to 4.5.0