diff options
| author | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
|---|---|---|
| committer | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
| commit | 6de4dcc7c99e14552303e5eee7dac31dd5e58e2e (patch) | |
| tree | 668904f3dba16ab39f683345b2e979e57696db94 /src/App.vue | |
| parent | 48edc0c8fcc6c63e432c9b6d78f14af086b56900 (diff) | |
| parent | 8e4777ccc6bf72b56a0905ca491c8e0e97fb73cf (diff) | |
Resolve merge conflict
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 9d66b9d4..16cd08d4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,7 +30,7 @@ <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> <features-panel v-if="!currentUser"></features-panel> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> - <notifications v-if="currentUser"></notifications> + <notifications :activatePanel="activatePanel" v-if="currentUser"></notifications> </div> </div> </div> |