resolved merge issue

Laurent Piron · Laurent Piron · commit 181dacf57ca9 · 2023-07-13T13:44:20.000+02:00
diff --git a/Cpix.bs.md b/Cpix.bs.md
@@ -1151,4 +1151,4 @@ Example CPIX documents are available on [GitHub](https://github.com/Dash-Industr
 		"publisher": "IETF"
 	}
 }
-</pre>
+</pre>

Original file line number	Diff line number	Diff line change
`@@ -1151,4 +1151,4 @@ Example CPIX documents are available on [GitHub](https://github.com/Dash-Industr`
`1151`	`1151`	`"publisher": "IETF"`
`1152`	`1152`	`}`
`1153`	`1153`	`}`
`1154`		`-</pre>`
	`1154`	`+</pre>`