Mercurial > projects > ddmd

diff dmd/Parser.d @ 24:1b81e14880ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a few merge issues.
author Robert Clipsham <robert@octarineparrot.com>
date Mon, 12 Apr 2010 17:02:32 +0100
parents 460959608115
children 544b922227c7
line wrap: on
line diff
--- a/dmd/Parser.d	Mon Apr 12 17:00:08 2010 +0100
+++ b/dmd/Parser.d	Mon Apr 12 17:02:32 2010 +0100
@@ -1077,17 +1077,6 @@
 	Lerr:
 		return tpl;
 	}
-<<<<<<< local
-	
-	/******************************************
-	 * Parse template mixin.
-	 *	mixin Foo;
-	 *	mixin Foo!(args);
-	 *	mixin a.b.c!(args).Foo!(args);
-	 *	mixin Foo!(args) identifier;
-	 *	mixin typeof(expr).identifier!(args);
-	 */
-=======
 
 /******************************************
  * Parse template mixin.