revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

unbreak celerity/map

Browse source 
Test Plan: phorge will load and serve pages

Reviewers: O1 Blessed Committers, aklapper

Reviewed By: O1 Blessed Committers, aklapper

Subscribers: aklapper, philj0st, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D25532
This commit is contained in:
Aviv Eyal 2024-02-05 20:07:41 +02:00
parent bb23e86daf
commit 9c9fbc3d04
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
resources/celerity/map.php
View file

@ -9,11 +9,7 @@ return array(
'names' => array( 'names' => array(
'conpherence.pkg.css' => '2f25eb4f', 'conpherence.pkg.css' => '2f25eb4f',
'conpherence.pkg.js' => '020aebcf', 'conpherence.pkg.js' => '020aebcf',
<<<<<<< HEAD 'core.pkg.css' => '7f47b2ac',
'core.pkg.css' => 'c753df75',
=======
'core.pkg.css' => '77d64402',
>>>>>>> 67b4f957d1 (Revert "Added cross-platform default fonts")
'core.pkg.js' => '2eeda9e0', 'core.pkg.js' => '2eeda9e0',
'dark-console.pkg.js' => '187792c2', 'dark-console.pkg.js' => '187792c2',
'differential.pkg.css' => '6d3700f0', 'differential.pkg.css' => '6d3700f0',
@ -112,13 +108,8 @@ return array(
'rsrc/css/application/slowvote/slowvote.css' => '1694baed', 'rsrc/css/application/slowvote/slowvote.css' => '1694baed',
'rsrc/css/application/tokens/tokens.css' => 'ce5a50bd', 'rsrc/css/application/tokens/tokens.css' => 'ce5a50bd',
'rsrc/css/application/uiexample/example.css' => 'b4795059', 'rsrc/css/application/uiexample/example.css' => 'b4795059',
<<<<<<< HEAD
'rsrc/css/core/core.css' => 'b3a5928e',
'rsrc/css/core/remarkup.css' => 'd91c2ee8',
=======
'rsrc/css/core/core.css' => '531ad849', 'rsrc/css/core/core.css' => '531ad849',
'rsrc/css/core/remarkup.css' => 'b251d2e7', 'rsrc/css/core/remarkup.css' => 'd91c2ee8',
>>>>>>> 67b4f957d1 (Revert "Added cross-platform default fonts")
'rsrc/css/core/syntax.css' => '548567f6', 'rsrc/css/core/syntax.css' => '548567f6',
'rsrc/css/core/z-index.css' => 'ac3bfcd4', 'rsrc/css/core/z-index.css' => 'ac3bfcd4',
'rsrc/css/diviner/diviner-shared.css' => '4bd263b0', 'rsrc/css/diviner/diviner-shared.css' => '4bd263b0',