felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-29 04:17:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts with dev

Browse Source
This commit is contained in:
danielyxie
2018-11-15 19:45:03 -08:00
parent d6bdc9433a 93f241029a
commit 9b3ff6d2d3
29 changed files with 4879 additions and 4314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+5 -2
View File
@@ -79,6 +79,9 @@
<li id="job-tab" class="mainmenu-accordion-panel">
<button id="job-menu-link"> Job </button>
</li>
<li id="stock-market-tab" class="mainmenu-accordion-panel">
<button id="stock-market-menu-link"> Stock Market </button>
</li>
<li id="bladeburner-tab" class="mainmenu-accordion-panel">
<button id="bladeburner-menu-link"> Bladeburner </button>
</li>
@@ -787,8 +790,8 @@
</table>
</div>
<div class="character-quick-options">
<button id="character-overview-save-button">Save Game</button>
<button id="character-overview-options-button">Options</button>
<button id="character-overview-save-button" class="character-overview-btn">Save Game</button>
<button id="character-overview-options-button" class="character-overview-btn">Options</button>
</div>
</div>
</div>