From 81a6aebbdf9319a731ee1ee368f2f05bf4bfd83c Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Tue, 5 May 2009 12:15:08 +0200 Subject: Doc: Git merge conflict in QVariantAnimation --- src/corelib/animation/qvariantanimation.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index dd32424..73ed0df 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -313,13 +313,6 @@ QVariantAnimation::~QVariantAnimation() The easing curve is used with the interpolator, the interpolated() virtual function, the animation's duration, and iterationCount, to control how the current value changes as the animation progresses. - -<<<<<<< Updated upstream:src/corelib/animation/qvariantanimation.cpp - The easing curve is used with the interpolator, the interpolated() virtual - function, the animation's duration, and loopCount, to control how the - current value changes as the animation progresses. -======= ->>>>>>> Stashed changes:src/corelib/animation/qvariantanimation.cpp */ QEasingCurve QVariantAnimation::easingCurve() const { -- cgit v0.12