Skip to content

Commit 8f5edb4

Browse files
committed
Devlink config fix
1 parent 5dd30ad commit 8f5edb4

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

packages/devlink/config/devlink.php

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -169,33 +169,6 @@
169169
],
170170

171171
// Moox Pro
172-
<<<<<<< Updated upstream
173-
'connect' => [
174-
'active' => false,
175-
'path' => $private_base_path.'/connect',
176-
'repo_url' => $private_repo_url,
177-
'type' => 'private',
178-
],
179-
'creator' => [
180-
'active' => false,
181-
'path' => $private_base_path.'/creator',
182-
'repo_url' => $private_repo_url,
183-
'type' => 'private',
184-
],
185-
'data' => [
186-
'active' => false,
187-
'path' => $private_base_path.'/data',
188-
'repo_url' => $private_repo_url,
189-
'type' => 'private',
190-
],
191-
'localize' => [
192-
'active' => false,
193-
'path' => $private_base_path.'/localize',
194-
'repo_url' => $private_repo_url,
195-
'type' => 'private',
196-
],
197-
=======
198-
>>>>>>> Stashed changes
199172
'media' => [
200173
'active' => false,
201174
'path' => $private_base_path.'/media',

0 commit comments

Comments
 (0)