merge conflicfixing extra line

Author: johndatserakis

tests/test.js

@@ -217,4 +217,4 @@ describe('note actions', () => {
         const response = await request.delete('/api/v1/notes/' + '1')
         expect(response.status).toBe(200)
     })
-})
+})