resolved merge conflict

2018-09-11 22:03:29 +01:00
parent b793c05d16 9a16dd2292
commit 9067731cec
13 changed files with 1525 additions and 75 deletions
--- a/src/controllers/noteController.js
+++ b/src/controllers/noteController.js
@@ -6,6 +6,7 @@ import {PermaLink} from '../models/permalinks/permalink';

 export class NoteController extends ControllerHandler {
    static async newNote(req, res, next) {
+<<<<<<< HEAD
        let errors = new API.errors(res);
        // Logger.debug(JSON.stringify(req.user, false, 4));

@@ -18,6 +19,9 @@ export class NoteController extends ControllerHandler {

        if (!creatorid) errors.addError(403, 'Forbidden');
        
+=======
+        Logger.debug(JSON.stringify(req.user));
+>>>>>>> 9a16dd229269b65aebe97d1fa8ce0aea771785ad
        

        next();