Fix merge conflict upstream

Soya-Onishi · Soya-Onishi · commit 75ae06a38085 · 2022-05-16T14:32:05.000Z
diff --git a/rclrs/src/node/mod.rs b/rclrs/src/node/mod.rs
@@ -79,8 +79,7 @@ impl fmt::Debug for Node {
 }
 
 impl Node {
-    /// Creates a new node in the empty namespace.
-    ///
+    /// Creates a new node in the empty namespace.    
     /// See [`Node::new_with_namespace`] for documentation.
     #[allow(clippy::new_ret_no_self)]
     pub fn new(node_name: &str, context: &Context) -> Result<Node, RclrsError> {

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,7 @@ impl fmt::Debug for Node {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`impl Node {`
`82`		`- /// Creates a new node in the empty namespace.`
`83`		`- ///`
	`82`	`+ /// Creates a new node in the empty namespace.`
`84`	`83`	/// See [`Node::new_with_namespace`] for documentation.
`85`	`84`	`#[allow(clippy::new_ret_no_self)]`
`86`	`85`	`pub fn new(node_name: &str, context: &Context) -> Result<Node, RclrsError> {`