Fixed merge conflicts.

1 files changed, 6 insertions, 16 deletions

diff --git a/src/web/js/constants/JarrConstants.js b/src/web/js/constants/JarrConstants.js
index 0ea42aad..78e8bf04 100644
--- a/src/web/js/constants/JarrConstants.js
+++ b/src/web/js/constants/JarrConstants.js
@@ -1,23 +1,13 @@
-/*
- * Copyright (c) 2014-2015, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * TodoConstants
- */
-
 var keyMirror = require('keymirror');
 
 module.exports = keyMirror({
         TOGGLE_MENU_FOLD: null,
         RELOAD_MENU: null,
-        PARENT_FILTER: null,
-        MENU_FILTER: null,
-        CHANGE_ATTR: null,
+        PARENT_FILTER: null,  // set a feed or a category as filter in menu
+        MENU_FILTER: null,  // change displayed feed in the menu
+        CHANGE_ATTR: null,  // edit an attr on an article (like / read)
         RELOAD_MIDDLE_PANEL: null,
-        MIDDLE_PANEL_FILTER: null,
-        LOAD_ARTICLE: null,
+        MIDDLE_PANEL_FILTER: null,  // set a filter (read/like/all)
+        LOAD_ARTICLE: null,  // load a single article in right panel
+        MARK_ALL_AS_READ: null,
 });