summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-02 18:02:17 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-02 18:02:17 +0800
commit6fc697e8368ec0ae80544b7edb8d0adc61891319 (patch)
tree1f3fb75f2fa834ebe33803ddbaf48ec41b7d2115
parent632c21c4b05dd56aea5a515a95d5e9bb77666af2 (diff)
downloadelements-6fc697e8368ec0ae80544b7edb8d0adc61891319.tar.gz
elements-6fc697e8368ec0ae80544b7edb8d0adc61891319.tar.bz2
Fix left over commit markers
-rw-r--r--src/elements.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/elements.cpp b/src/elements.cpp
index 1e60176..7f5cde6 100644
--- a/src/elements.cpp
+++ b/src/elements.cpp
@@ -404,14 +404,8 @@ PrivateElementScreen::switchTimeout ()
if (text)
{
if (!text->eTextures.empty ())
- {
-<<<<<<< HEAD
- text->nTexture =
- ++text->nTexture %
-=======
text->nTexture =
(text->nTexture + 1) %
->>>>>>> 246cfdb98b6724ff4d9791f853cb65a7777104c9
(text->eTextures.size ());
}
}