diff --git a/cg/cg2104.cpp b/cg/cg2104.cpp
index e3f438318..73845e084 100755
--- a/cg/cg2104.cpp
+++ b/cg/cg2104.cpp
@@ -906,7 +906,7 @@ void TPrimanota_application::write_scadenze(const TMask& m)
       TToken_string& row = ps.row(i);
       
       TRiga_scadenze& scadenza = partita.new_row(); 
-<<<<<<< cg2104.cpp
+
       scadenza.put(SCAD_CODPAG,     codpag);     // Codice pagamento
       scadenza.put(SCAD_CODAG,      agente);     // Codice agente