From: Brian Paul <brianp@vmware.com>
Date: Wed, 25 Feb 2009 00:53:39 +0000 (-0700)
Subject: mesa: fix merge conflict (in comment)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bfdbbfb0251bcd17c1a559668d0f4a0d36847a84;p=mesa.git

mesa: fix merge conflict (in comment)
---

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 9287e8515cc..f5bf6e2c855 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.
  *