From 7da33614f1a8708bebcb4f04ee99224c5d6db1d3 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Fri, 7 Jul 2023 18:57:04 +0200 Subject: Updated 4 files and added .idea/workspace.sync-conflict-20230705-192530-SY6BK7A.xml (automated) --- ...space.sync-conflict-20230705-192530-SY6BK7A.xml | 703 +++++++++++++++++++++ includes/jobs/PKFronters.php | 2 +- includes/jobs/RefreshCache.php | 2 +- includes/jobs/UpdateAssets.php | 14 +- includes/jobs/UpdateContactMethods.php | 2 +- 5 files changed, 713 insertions(+), 10 deletions(-) create mode 100644 .idea/workspace.sync-conflict-20230705-192530-SY6BK7A.xml diff --git a/.idea/workspace.sync-conflict-20230705-192530-SY6BK7A.xml b/.idea/workspace.sync-conflict-20230705-192530-SY6BK7A.xml new file mode 100644 index 0000000..1c1ea95 --- /dev/null +++ b/.idea/workspace.sync-conflict-20230705-192530-SY6BK7A.xml @@ -0,0 +1,703 @@ + + + + + + + + + + + + + + + + $PROJECT_DIR$/composer.json + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "keyToString": { + "ASKED_ADD_EXTERNAL_FILES": "true", + "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true", + "DefaultHtmlFileTemplate": "HTML File", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "true", + "codeWithMe.voiceChat.enabledByDefault": "false", + "git-widget-placeholder": "mane", + "javascript.nodejs.core.library.configured.version": "18.4.0", + "javascript.nodejs.core.library.typings.version": "18.16.19", + "last_opened_file_path": "/Volumes/Unicorn/cold-haze/includes/data/metadata", + "list.type.of.created.stylesheet": "CSS", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "run.code.analysis.last.selected.profile": "pProject Default", + "settings.editor.selected.configurable": "settings.sync", + "timeTracker.activityTracker": "null", + "timeTracker.comment": "", + "timeTracker.inactivityPeriodInMills": "600000", + "timeTracker.isAutoTrackingEnable": "false", + "timeTracker.isAutoTrackingTemporaryDisabled": "false", + "timeTracker.isManualTrackingEnable": "false", + "timeTracker.isPaused": "true", + "timeTracker.isPostAfterCommitEnabled": "false", + "timeTracker.isPostedScheduled": "true", + "timeTracker.isRunning": "false", + "timeTracker.isScheduledEnabled": "false", + "timeTracker.isWhenProjectClosedEnabled": "false", + "timeTracker.issueId": "Default", + "timeTracker.issueIdReadable": "Default", + "timeTracker.pausedTime": "0", + "timeTracker.query": "", + "timeTracker.recordedTime": "0", + "timeTracker.scheduledPeriod": "19:00:0", + "timeTracker.startTime": "0", + "timeTracker.timeInMills": "0", + "timeTracker.type": "Development", + "ts.external.directory.path": "/Users/raindrops/Library/Application Support/JetBrains/Toolbox/apps/PhpStorm/ch-0/231.8109.199/PhpStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/external", + "vue.rearranger.settings.migration": "true" + }, + "keyToStringList": { + "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [ + "PLAIN_TEXT" + ], + "stardust.markdown.MarkdownSplitEditorSuppressor:keyList": [ + ] + } +} + + + + + + + + + + + + + + + + + + + + + + + 1658734293597 + + + + + + + + + +