1 files changed, 0 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 9eda9851..401b408a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -57,5 +57,3 @@ a license to everyone to use it as detailed in LICENSE.)
 * Ting-Yuan Huang <thuang@mozilla.com>
 * Felix H. Dahlke <fhd@ubercode.de>
 * Éloi Rivard <azmeuk@gmail.com>
-
->>>>>>> * OpenGL extensions.