diff --git a/[refs] b/[refs] index e54baa4b33f03..c3cee09115508 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 3867b719e701b5b18d4d1ebb5a694bd8e63410ea +"refs/heads/CMSSW_7_1_X": b33baa45dc1d4b233ca48516545b24b8e95407dd diff --git a/trunk/FWCore/GuiBrowsers/test/Views/testLineDecayView.py b/trunk/FWCore/GuiBrowsers/test/Views/testLineDecayView.py index 98a467c6f0fa2..ef01dab1bdb22 100755 --- a/trunk/FWCore/GuiBrowsers/test/Views/testLineDecayView.py +++ b/trunk/FWCore/GuiBrowsers/test/Views/testLineDecayView.py @@ -11,6 +11,7 @@ import Path from Vispa.Main.Directories import * +from Vispa.Main.Exceptions import exception_traceback from Vispa.Gui.ZoomableScrollArea import ZoomableScrollArea from Vispa.Views.LineDecayView import LineDecayView from TestDataAccessor import TestDataAccessor