From 877396efab247de96877d418d1a4ee9ef6474c32 Mon Sep 17 00:00:00 2001
From: Good Guy <good1.2guy@gmail.com>
Date: Sat, 6 May 2023 17:52:14 -0600
Subject: [PATCH] version update

---
 cinelerra-5.1/msg/txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 7eed4f3a..bf7794b3 100644
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,6 +3,11 @@ 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
-- 
2.26.2