summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-24 17:53:39 -0700
committerBrian Paul <brianp@vmware.com>2009-02-24 17:53:39 -0700
commitbfdbbfb0251bcd17c1a559668d0f4a0d36847a84 (patch)
tree19ecc55cd6a770d7db75cb4f807488f18f3c1707 /src
parent8e6337f582d02d7a8884625b820266590d9ad81c (diff)
mesa: fix merge conflict (in comment)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/version.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 9287e8515c..f5bf6e2c85 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,10 +1,6 @@
/*
* Mesa 3-D graphics library
-<<<<<<< HEAD:src/mesa/main/version.h
* Version: 7.5
-=======
- * Version: 7.4
->>>>>>> origin/gallium-0.2:src/mesa/main/version.h
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*