From 744809e71a44f758fd3c4acefa97c7a32c249a26 Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
 <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 13 Dec 2010 21:25:43 +0000
Subject: fix bad merge

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69054 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/common/render_messages_params.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index af32a1a..7b21a20 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -1018,7 +1018,6 @@ struct ParamTraits<ViewHostMsg_ScriptedPrint_Params> {
 };
 
 template <>
-template<>
 struct ParamTraits<ViewMsg_ExecuteCode_Params> {
   typedef ViewMsg_ExecuteCode_Params param_type;
   static void Write(Message* m, const param_type& p);
-- 
cgit v1.1