afc023e Fix file conflicts in SQL files

Authored and Committed by antorres 2 years ago
    Fix file conflicts in SQL files
    
    Resolves: bz#2014014
    Signed-off-by: Antonio Torres <antorres@redhat.com>
    
        
file modified
+8 -2