The bottom block decoration is being created at the end of the line

smashwilson · smashwilson · commit b8e3de772fdd · 2017-05-03T16:18:50.000-04:00
diff --git a/test/controllers/conflict-controller.test.js b/test/controllers/conflict-controller.test.js
@@ -80,7 +80,7 @@ describe('ConflictController', function() {
     assert.deepEqual(theirBannerDecorations.map(textFromDecoration), ['>>>>>>> other-branch\n']);
 
     const theirBlockDecorations = decorationsMatching({type: 'block', position: 'after'});
-    assert.deepEqual(theirBlockDecorations.map(pointFromDecoration), [[17, 0]]);
+    assert.deepEqual(theirBlockDecorations.map(pointFromDecoration), [[17, 20]]);
   });
 
   it('creates a line Decoration for resolved conflicts', async function() {
