Commit204a037

committed

Fixing conflict errors with the use of the name status_message.

1 parent5b11931 commit204a037Copy full SHA for 204a037

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespaceboost {namespacenetwork {namespacehttp {`
`13`	`13`
`14`	`14`	`template<>`
`15`		`-structstatus_message<tags::http_default_8bit_tcp_resolve> {`
	`15`	`+structstatus_message_text<tags::http_default_8bit_tcp_resolve> {`
`16`	`16`	`static boost::uint32_tconst MAX =1024u;`
`17`	`17`	`};`
`18`	`18`

Comments

(0)