Code review comment for lp:~roadmr/checkbox/bug-937099

Right, but that's common because the same part of the same file is changed for every merge request. So, the person merging a branch should make sure to properly resolve any conflicts such as this one. This is what I did when merging this branch as revno 1275 in trunk:

=== modified file 'debian/changelog'
--- debian/changelog 2012-02-22 18:02:51 +0000
+++ debian/changelog 2012-02-22 21:05:54 +0000
@@ -1,5 +1,11 @@
 checkbox (0.13.3) precise; urgency=low

+ [Brendan Donegan]
+ * Typo in command for for miscellanea/virtualization-check (LP: #934243)
+
+ [Daniel Manrique]
+ * Use GObject from gi.repository instead of gobject (LP: #937099)
+
   [Javier Collado]
   * Fixed running of disk/read_performance tests (LP: #933528)

@@ -7,9 +13,6 @@
   * Fix depends fields in info and suspend test suites (LP: #934051)
   * Display results report in non-graphical interfaces (LP: #937657)

- [Brendan Donegan]
- * Typo in command for for miscellanea/virtualization-check (LP: #934243)
-
   [ Tiago Salem Herrmann ]
   * Remove auto generated qt resource file (LP: #938863)