thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2025-03-28 03:38:46 +00:00
Code Issues Releases Activity Actions

Remove merge conflict marker

Browse source
This commit is contained in:
unsoftcapped3 2022-12-12 15:32:15 -08:00 • committed by GitHub
parent 73c52990d8
commit de0cfc22f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions

3
src/data/layers/management.tsx
View file

@ -1240,13 +1240,10 @@ const layer = createLayer(id, () => {
focusMultiplier: focusMulti,
upgrades,
focusTargets,
<<<<<<< HEAD
focusCooldown,
focusTime,
=======
focusRolling,
>>>>>>> bee8ce7d5169e7205fa7dc409d6488a902a890f5
display: jsx(() => (
<>