From 0963ebcc9a5fff3eb70c55077492e71388819e39 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 13 Jul 2023 18:57:29 +0200
Subject: [PATCH] Fix from 9.5.3

---
 sco_version.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sco_version.py b/sco_version.py
index 168508505..9ad23532e 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,11 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-<<<<<<< HEAD
 SCOVERSION = "9.6.0"
-=======
-SCOVERSION = "9.5.3"
->>>>>>> 2c93c35aa7972b502ddbda69b35cb40773317647
 
 SCONAME = "ScoDoc"