Fix merge

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
open-rmf · May 5, 2022 · 9ad33ed · 9ad33ed
2 parents 01d3f7b + 63fce74
commit 9ad33ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rmf_task/CHANGELOG.md b/rmf_task/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 2.1.0 (2022-XX-YY)
 ------------------
-* Allow GoToPlace to know about expected future destinations [#61](https://github.com/open-rmf/rmf_task/pull/61)
 * Fix undefined behavior in log: [#62](https://github.com/open-rmf/rmf_task/pull/62)
 
 2.0.0 (2022-02-14)

diff --git a/rmf_task_sequence/CHANGELOG.md b/rmf_task_sequence/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog for package rmf_task_sequence
 
+2.1.0 (2022-XX-YY)
+------------------
+*  Allow GoToPlace to know about expected future destinations [#61](https://github.com/open-rmf/rmf_task/pull/61)
+
 2.0.0 (2022-02-14)
 ------------------
 * Support flexible task definitions [#39](https://github.com/open-rmf/rmf_task/pull/39)