krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
Victor Piousbox
2016-04-04 16:37:51 +00:00
parent 14b0ec8b03 68ff26e6d6
commit 4c0f9ed1c8
20 changed files with 582 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/gulp-eslint.js
View File

@@ -13,14 +13,12 @@ const COMMON_FILES = [
'!./common/script/ops/addPushDevice.js',
'!./common/script/ops/addTag.js',
'!./common/script/ops/addTask.js',
'!./common/script/ops/addWebhook.js',
'!./common/script/ops/blockUser.js',
'!./common/script/ops/clearCompleted.js',
'!./common/script/ops/clearPMs.js',
'!./common/script/ops/deletePM.js',
'!./common/script/ops/deleteTag.js',
'!./common/script/ops/deleteTask.js',
'!./common/script/ops/deleteWebhook.js',
'!./common/script/ops/getTag.js',
'!./common/script/ops/getTags.js',
'!./common/script/ops/rebirth.js',
@@ -37,7 +35,6 @@ const COMMON_FILES = [
'!./common/script/ops/update.js',
'!./common/script/ops/updateTag.js',
'!./common/script/ops/updateTask.js',
'!./common/script/ops/updateWebhook.js',
'!./common/script/fns/crit.js',
'!./common/script/fns/cron.js',
'!./common/script/fns/dotGet.js',