<<<<<<< HEAD ======= >>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117 $PROJECT_DIR$/composer.json { "customColor": "", "associatedIndex": 6 } { "keyToString": { "RunOnceActivity.ShowReadmeOnStart": "true", <<<<<<< HEAD "git-widget-placeholder": "develop", "last_opened_file_path": "E:/BTS/PhpStorm/centre_fitness", ======= "RunOnceActivity.git.unshallow": "true", "git-widget-placeholder": "develop", "last_opened_file_path": "/home/ragueneaul@stsio.lan/Documents/DecoMaison_Lucas_Ragueneau", >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f "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", <<<<<<< HEAD "php.add.doc.comment.for.fields.panel.add.php.doc.for.all.properties": "true", "settings.editor.selected.configurable": "inlay.hints", ======= >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f "vue.rearranger.settings.migration": "true" }, "keyToStringList": { "DatabaseDriversLRU": [ <<<<<<< HEAD "postgresql", "mysql" ======= "postgresql" >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f ] } } <<<<<<< HEAD ======= >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f 1728656378023 1728656378023 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f >>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117