File tree Expand file tree Collapse file tree 2 files changed +27
-0
lines changed
Expand file tree Collapse file tree 2 files changed +27
-0
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,8 @@ packages/*
2626! packages/* /.gitkeep
2727# and for windows
2828/packageslocal/*
29+ # optional:
30+ composer.json-deploy
2931
3032```
3133
Original file line number Diff line number Diff line change 169169 ],
170170
171171 // Moox Pro
172+ <<<<<<< Updated upstream
172173 'connect ' => [
173174 'active ' => false ,
174175 'path ' => $ private_base_path .'/connect ' ,
193194 'repo_url ' => $ private_repo_url ,
194195 'type ' => 'private ' ,
195196 ],
197+ =======
198+ >>>>>>> Stashed changes
196199 'media ' => [
197200 'active ' => false ,
198201 'path ' => $ private_base_path .'/media ' ,
211214 'repo_url ' => $ private_repo_url ,
212215 'type ' => 'private ' ,
213216 ],
217+
218+ // Local
219+ 'connect ' => [
220+ 'active ' => false ,
221+ 'type ' => 'local ' ,
222+ ],
223+ 'hecoweb ' => [
224+ 'active ' => true ,
225+ 'type ' => 'local ' ,
226+ ],
227+ 'myheco ' => [
228+ 'active ' => true ,
229+ 'type ' => 'local ' ,
230+ ],
231+ 'data ' => [
232+ 'active ' => true ,
233+ 'type ' => 'local ' ,
234+ ],
235+ 'localization ' => [
236+ 'active ' => true ,
237+ 'type ' => 'local ' ,
238+ ],
214239 ],
215240
216241 'packages_path ' => $ packages_path ,
You can’t perform that action at this time.
0 commit comments