merge conflicfixing extra line

fafo · Aug 31, 2017 · 0e6f336 · 0e6f336
1 parent d5ff7ce
commit 0e6f336
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/test.js b/tests/test.js
@@ -217,4 +217,4 @@ describe('note actions', () => {
         const response = await request.delete('/api/v1/notes/' + '1')
         expect(response.status).toBe(200)
     })
-})
+})