summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/reports/store/state.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/reports/store/state.js')
-rw-r--r--app/assets/javascripts/reports/store/state.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/reports/store/state.js b/app/assets/javascripts/reports/store/state.js
index 02197fbb97a..71300137fe7 100644
--- a/app/assets/javascripts/reports/store/state.js
+++ b/app/assets/javascripts/reports/store/state.js
@@ -37,7 +37,10 @@ export default () => ({
status: null,
isCreatingNewIssue: false,
+<<<<<<< HEAD
isLoading: false,
+=======
+>>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd
hasError: false,
data: {