2e1d484 devel: Conflicts: kapptemplate < 16.03.80

Authored and Committed by Rex Dieter 8 years ago
    devel: Conflicts: kapptemplate < 16.03.80
    
        
file modified
+9 -7