cms-sw/cmssw — pull request #5108 by ktf (2014-08-29 13:52:37+00:00)
Title: give

Due to a non-resolvable conflict, git stopped merging CMSSW_7_2_X in CMSSW_7_2_ROOT6_X. This fixes the issue by explicitly deleting the files which got deleted in CMSSW_7_2_X and should resume automatic updates.