added protection to Makfile against deploying cvs conflicts
[freeside.git] / debian / templates