From 55ba45f43af7930c1af65ced2509b75a422faceb Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 26 Aug 1994 16:10:19 +0000
Subject: [PATCH] Corretto conflitto precedente

git-svn-id: svn://10.65.10.50/trunk@76 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg4500.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/cg/cg4500.cpp b/cg/cg4500.cpp
index 8e865b5c3..c20efd6cd 100755
--- a/cg/cg4500.cpp
+++ b/cg/cg4500.cpp
@@ -572,15 +572,4 @@ int cg4500 (int argc, char* argv[])
   main_app.run(argc, argv, "");
   return TRUE;
 }
-<<<<<<< cg4500.cpp
 
-
-
-
-
-
-
-
-
-=======
->>>>>>> 1.4