X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fmsg%2Ftxt;h=af97ee55e5ecd5fba4287ce314d23e72458dcdd7;hb=2e9b85a9600790c491e3c4bf62bce17b195f91ae;hp=bf7794b37f6816a5eb7d4809bb285b8663718cbf;hpb=63f6e5905e9f2f3dfe4aff219d92982fb3429cb9;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index bf7794b3..af97ee55 100644
--- 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