diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 21:25:43 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 21:25:43 +0000 |
commit | 744809e71a44f758fd3c4acefa97c7a32c249a26 (patch) | |
tree | d79127bb29e09fa2c7c21a5bdcd7dd83d192b6c9 /chrome/common | |
parent | 4ce9fde5e920775a278539cf5efd8634423d9b29 (diff) | |
download | chromium_src-744809e71a44f758fd3c4acefa97c7a32c249a26.zip chromium_src-744809e71a44f758fd3c4acefa97c7a32c249a26.tar.gz chromium_src-744809e71a44f758fd3c4acefa97c7a32c249a26.tar.bz2 |
fix bad merge
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/render_messages_params.h | 1 |
1 files changed, 0 insertions, 1 deletions
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); |