Skip to content
Snippets Groups Projects
Commit 744809e7 authored by jam@chromium.org's avatar jam@chromium.org
Browse files

fix bad merge 

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69054 0039d316-1c4b-4281-b951-d872f2087c98
parent 4ce9fde5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
chrome/common/render_messages_params.h
+ 0
− 1
View file @ 744809e7
...@@ -1018,7 +1018,6 @@ struct ParamTraits<ViewHostMsg_ScriptedPrint_Params> { ...@@ -1018,7 +1018,6 @@ struct ParamTraits<ViewHostMsg_ScriptedPrint_Params> {
}; };
template <> template <>
template<>
struct ParamTraits<ViewMsg_ExecuteCode_Params> { struct ParamTraits<ViewMsg_ExecuteCode_Params> {
typedef ViewMsg_ExecuteCode_Params param_type; typedef ViewMsg_ExecuteCode_Params param_type;
static void Write(Message* m, const param_type& p); static void Write(Message* m, const param_type& p);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment