Skip to content

Commit c3c2e26

Browse files
rins6618rins6618
committed
MISC: merge conflicts
1 parent be2d665 commit c3c2e26

File tree

1 file changed

+128
-128
lines changed

1 file changed

+128
-128
lines changed

‎src/Documentation/pages.ts‎

Lines changed: 128 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
// THIS FILE IS AUTOGENERATED. DO NOT EDIT IT MANUALLY.
2-
import file0 from "./doc/advanced/bitnode_recommendations.md?raw";
3-
import file1 from "./doc/advanced/bitnodes.md?raw";
4-
import file2 from "./doc/advanced/bladeburners.md?raw";
5-
import file3 from "./doc/advanced/corporation/basic-gameplay-and-term.md?raw";
6-
import file4 from "./doc/advanced/corporation/boost-material.md?raw";
7-
import file5 from "./doc/advanced/corporation/demand-competition.md?raw";
8-
import file6 from "./doc/advanced/corporation/division-raw-production.md?raw";
9-
import file7 from "./doc/advanced/corporation/faq.md?raw";
10-
import file8 from "./doc/advanced/corporation/financial-statement.md?raw";
11-
import file9 from "./doc/advanced/corporation/general-advice.md?raw";
12-
import file10 from "./doc/advanced/corporation/industry-supply-chain.md?raw";
13-
import file11 from "./doc/advanced/corporation/miscellany.md?raw";
14-
import file12 from "./doc/advanced/corporation/office.md?raw";
15-
import file13 from "./doc/advanced/corporation/optimal-selling-price-market-ta2.md?raw";
16-
import file14 from "./doc/advanced/corporation/product.md?raw";
17-
import file15 from "./doc/advanced/corporation/quality.md?raw";
18-
import file16 from "./doc/advanced/corporation/smart-supply.md?raw";
19-
import file17 from "./doc/advanced/corporation/unlocks-upgrade-research.md?raw";
20-
import file18 from "./doc/advanced/corporation/warehouse.md?raw";
21-
import file19 from "./doc/advanced/corporation/wilson-analytics-advert.md?raw";
22-
import file20 from "./doc/advanced/corporations.md?raw";
23-
import file21 from "./doc/advanced/faction_list.md?raw";
24-
import file22 from "./doc/advanced/gang.md?raw";
25-
import file23 from "./doc/advanced/grafting.md?raw";
26-
import file24 from "./doc/advanced/hacknetservers.md?raw";
27-
import file25 from "./doc/advanced/intelligence.md?raw";
28-
import file26 from "./doc/advanced/offlineandbonustime.md?raw";
29-
import file27 from "./doc/advanced/sleeves.md?raw";
30-
import file28 from "./doc/advanced/sourcefiles.md?raw";
31-
import file29 from "./doc/advanced/stanek.md?raw";
32-
import file30 from "./doc/basic/augmentations.md?raw";
33-
import file31 from "./doc/basic/autocomplete_help.md?raw";
34-
import file32 from "./doc/basic/codingcontracts.md?raw";
35-
import file33 from "./doc/basic/companies.md?raw";
36-
import file34 from "./doc/basic/crimes.md?raw";
37-
import file35 from "./doc/basic/factions.md?raw";
38-
import file36 from "./doc/basic/hacking.md?raw";
39-
import file37 from "./doc/basic/hacknet_nodes.md?raw";
40-
import file38 from "./doc/basic/infiltration.md?raw";
41-
import file39 from "./doc/basic/programs.md?raw";
42-
import file40 from "./doc/basic/ram.md?raw";
43-
import file41 from "./doc/basic/reputation.md?raw";
44-
import file42 from "./doc/basic/scripts.md?raw";
45-
import file43 from "./doc/basic/servers.md?raw";
46-
import file44 from "./doc/basic/stats.md?raw";
47-
import file45 from "./doc/basic/stockmarket.md?raw";
48-
import file46 from "./doc/basic/terminal.md?raw";
49-
import file47 from "./doc/basic/world.md?raw";
50-
import file48 from "./doc/changelog-v0.md?raw";
51-
import file49 from "./doc/changelog-v1.md?raw";
52-
import file50 from "./doc/changelog.md?raw";
53-
import file51 from "./doc/help/getting_started.md?raw";
54-
import file52 from "./doc/help/tools_and_resources.md?raw";
55-
import file53 from "./doc/index.md?raw";
56-
import file54 from "./doc/migrations/ns2.md?raw";
57-
import file55 from "./doc/migrations/v1.md?raw";
58-
import file56 from "./doc/migrations/v2.md?raw";
59-
import file57 from "./doc/programming/game_frozen.md?raw";
60-
import file58 from "./doc/programming/go_algorithms.md?raw";
61-
import file59 from "./doc/programming/hackingalgorithms.md?raw";
62-
import file60 from "./doc/programming/learn.md?raw";
63-
import file61 from "./doc/programming/react.md?raw";
64-
import file62 from "./doc/programming/remote_api.md?raw";
65-
import nsDoc_bitburner__valueof_md from "../../markdown/bitburner._valueof.md?raw";
2+
import file0 from "./doc/advanced/bitnodes.md?raw";
3+
import file1 from "./doc/advanced/bitnode_recommendation_comprehensive_guide.md?raw";
4+
import file2 from "./doc/advanced/bitnode_recommendation_short_guide.md?raw";
5+
import file3 from "./doc/advanced/bladeburners.md?raw";
6+
import file4 from "./doc/advanced/corporation/basic-gameplay-and-term.md?raw";
7+
import file5 from "./doc/advanced/corporation/boost-material.md?raw";
8+
import file6 from "./doc/advanced/corporation/demand-competition.md?raw";
9+
import file7 from "./doc/advanced/corporation/division-raw-production.md?raw";
10+
import file8 from "./doc/advanced/corporation/faq.md?raw";
11+
import file9 from "./doc/advanced/corporation/financial-statement.md?raw";
12+
import file10 from "./doc/advanced/corporation/general-advice.md?raw";
13+
import file11 from "./doc/advanced/corporation/industry-supply-chain.md?raw";
14+
import file12 from "./doc/advanced/corporation/miscellany.md?raw";
15+
import file13 from "./doc/advanced/corporation/office.md?raw";
16+
import file14 from "./doc/advanced/corporation/optimal-selling-price-market-ta2.md?raw";
17+
import file15 from "./doc/advanced/corporation/product.md?raw";
18+
import file16 from "./doc/advanced/corporation/quality.md?raw";
19+
import file17 from "./doc/advanced/corporation/smart-supply.md?raw";
20+
import file18 from "./doc/advanced/corporation/unlocks-upgrade-research.md?raw";
21+
import file19 from "./doc/advanced/corporation/warehouse.md?raw";
22+
import file20 from "./doc/advanced/corporation/wilson-analytics-advert.md?raw";
23+
import file21 from "./doc/advanced/corporations.md?raw";
24+
import file22 from "./doc/advanced/faction_list.md?raw";
25+
import file23 from "./doc/advanced/gang.md?raw";
26+
import file24 from "./doc/advanced/grafting.md?raw";
27+
import file25 from "./doc/advanced/hacknetservers.md?raw";
28+
import file26 from "./doc/advanced/intelligence.md?raw";
29+
import file27 from "./doc/advanced/offlineandbonustime.md?raw";
30+
import file28 from "./doc/advanced/sleeves.md?raw";
31+
import file29 from "./doc/advanced/sourcefiles.md?raw";
32+
import file30 from "./doc/advanced/stanek.md?raw";
33+
import file31 from "./doc/basic/augmentations.md?raw";
34+
import file32 from "./doc/basic/autocomplete_help.md?raw";
35+
import file33 from "./doc/basic/codingcontracts.md?raw";
36+
import file34 from "./doc/basic/companies.md?raw";
37+
import file35 from "./doc/basic/crimes.md?raw";
38+
import file36 from "./doc/basic/factions.md?raw";
39+
import file37 from "./doc/basic/hacking.md?raw";
40+
import file38 from "./doc/basic/hacknet_nodes.md?raw";
41+
import file39 from "./doc/basic/infiltration.md?raw";
42+
import file40 from "./doc/basic/programs.md?raw";
43+
import file41 from "./doc/basic/ram.md?raw";
44+
import file42 from "./doc/basic/reputation.md?raw";
45+
import file43 from "./doc/basic/scripts.md?raw";
46+
import file44 from "./doc/basic/servers.md?raw";
47+
import file45 from "./doc/basic/stats.md?raw";
48+
import file46 from "./doc/basic/stockmarket.md?raw";
49+
import file47 from "./doc/basic/terminal.md?raw";
50+
import file48 from "./doc/basic/world.md?raw";
51+
import file49 from "./doc/changelog-v0.md?raw";
52+
import file50 from "./doc/changelog-v1.md?raw";
53+
import file51 from "./doc/changelog.md?raw";
54+
import file52 from "./doc/help/getting_started.md?raw";
55+
import file53 from "./doc/help/tools_and_resources.md?raw";
56+
import file54 from "./doc/index.md?raw";
57+
import file55 from "./doc/migrations/ns2.md?raw";
58+
import file56 from "./doc/migrations/v1.md?raw";
59+
import file57 from "./doc/migrations/v2.md?raw";
60+
import file58 from "./doc/programming/game_frozen.md?raw";
61+
import file59 from "./doc/programming/go_algorithms.md?raw";
62+
import file60 from "./doc/programming/hackingalgorithms.md?raw";
63+
import file61 from "./doc/programming/learn.md?raw";
64+
import file62 from "./doc/programming/react.md?raw";
65+
import file63 from "./doc/programming/remote_api.md?raw";
6666
import nsDoc_bitburner_activefragment_highestcharge_md from "../../markdown/bitburner.activefragment.highestcharge.md?raw";
6767
import nsDoc_bitburner_activefragment_id_md from "../../markdown/bitburner.activefragment.id.md?raw";
6868
import nsDoc_bitburner_activefragment_md from "../../markdown/bitburner.activefragment.md?raw";
@@ -1508,70 +1508,70 @@ import nsDoc_bitburner__valueof_md from "../../markdown/bitburner._valueof.md?ra
15081508
import nsDoc_index_md from "../../markdown/index.md?raw";
15091509

15101510
export const AllPages: Record<string, string> = {};
1511-
AllPages["advanced/bitnode_recommendations.md"] = file0;
1512-
AllPages["advanced/bitnodes.md"] = file1;
1513-
AllPages["advanced/bladeburners.md"] = file2;
1514-
AllPages["advanced/corporation/basic-gameplay-and-term.md"] = file3;
1515-
AllPages["advanced/corporation/boost-material.md"] = file4;
1516-
AllPages["advanced/corporation/demand-competition.md"] = file5;
1517-
AllPages["advanced/corporation/division-raw-production.md"] = file6;
1518-
AllPages["advanced/corporation/faq.md"] = file7;
1519-
AllPages["advanced/corporation/financial-statement.md"] = file8;
1520-
AllPages["advanced/corporation/general-advice.md"] = file9;
1521-
AllPages["advanced/corporation/industry-supply-chain.md"] = file10;
1522-
AllPages["advanced/corporation/miscellany.md"] = file11;
1523-
AllPages["advanced/corporation/office.md"] = file12;
1524-
AllPages["advanced/corporation/optimal-selling-price-market-ta2.md"] = file13;
1525-
AllPages["advanced/corporation/product.md"] = file14;
1526-
AllPages["advanced/corporation/quality.md"] = file15;
1527-
AllPages["advanced/corporation/smart-supply.md"] = file16;
1528-
AllPages["advanced/corporation/unlocks-upgrade-research.md"] = file17;
1529-
AllPages["advanced/corporation/warehouse.md"] = file18;
1530-
AllPages["advanced/corporation/wilson-analytics-advert.md"] = file19;
1531-
AllPages["advanced/corporations.md"] = file20;
1532-
AllPages["advanced/faction_list.md"] = file21;
1533-
AllPages["advanced/gang.md"] = file22;
1534-
AllPages["advanced/grafting.md"] = file23;
1535-
AllPages["advanced/hacknetservers.md"] = file24;
1536-
AllPages["advanced/intelligence.md"] = file25;
1537-
AllPages["advanced/offlineandbonustime.md"] = file26;
1538-
AllPages["advanced/sleeves.md"] = file27;
1539-
AllPages["advanced/sourcefiles.md"] = file28;
1540-
AllPages["advanced/stanek.md"] = file29;
1541-
AllPages["basic/augmentations.md"] = file30;
1542-
AllPages["basic/autocomplete_help.md"] = file31;
1543-
AllPages["basic/codingcontracts.md"] = file32;
1544-
AllPages["basic/companies.md"] = file33;
1545-
AllPages["basic/crimes.md"] = file34;
1546-
AllPages["basic/factions.md"] = file35;
1547-
AllPages["basic/hacking.md"] = file36;
1548-
AllPages["basic/hacknet_nodes.md"] = file37;
1549-
AllPages["basic/infiltration.md"] = file38;
1550-
AllPages["basic/programs.md"] = file39;
1551-
AllPages["basic/ram.md"] = file40;
1552-
AllPages["basic/reputation.md"] = file41;
1553-
AllPages["basic/scripts.md"] = file42;
1554-
AllPages["basic/servers.md"] = file43;
1555-
AllPages["basic/stats.md"] = file44;
1556-
AllPages["basic/stockmarket.md"] = file45;
1557-
AllPages["basic/terminal.md"] = file46;
1558-
AllPages["basic/world.md"] = file47;
1559-
AllPages["changelog-v0.md"] = file48;
1560-
AllPages["changelog-v1.md"] = file49;
1561-
AllPages["changelog.md"] = file50;
1562-
AllPages["help/getting_started.md"] = file51;
1563-
AllPages["help/tools_and_resources.md"] = file52;
1564-
AllPages["index.md"] = file53;
1565-
AllPages["migrations/ns2.md"] = file54;
1566-
AllPages["migrations/v1.md"] = file55;
1567-
AllPages["migrations/v2.md"] = file56;
1568-
AllPages["programming/game_frozen.md"] = file57;
1569-
AllPages["programming/go_algorithms.md"] = file58;
1570-
AllPages["programming/hackingalgorithms.md"] = file59;
1571-
AllPages["programming/learn.md"] = file60;
1572-
AllPages["programming/react.md"] = file61;
1573-
AllPages["programming/remote_api.md"] = file62;
1574-
AllPages["nsDoc/bitburner._valueof.md"] = nsDoc_bitburner__valueof_md;
1511+
AllPages["advanced/bitnodes.md"] = file0;
1512+
AllPages["advanced/bitnode_recommendation_comprehensive_guide.md"] = file1;
1513+
AllPages["advanced/bitnode_recommendation_short_guide.md"] = file2;
1514+
AllPages["advanced/bladeburners.md"] = file3;
1515+
AllPages["advanced/corporation/basic-gameplay-and-term.md"] = file4;
1516+
AllPages["advanced/corporation/boost-material.md"] = file5;
1517+
AllPages["advanced/corporation/demand-competition.md"] = file6;
1518+
AllPages["advanced/corporation/division-raw-production.md"] = file7;
1519+
AllPages["advanced/corporation/faq.md"] = file8;
1520+
AllPages["advanced/corporation/financial-statement.md"] = file9;
1521+
AllPages["advanced/corporation/general-advice.md"] = file10;
1522+
AllPages["advanced/corporation/industry-supply-chain.md"] = file11;
1523+
AllPages["advanced/corporation/miscellany.md"] = file12;
1524+
AllPages["advanced/corporation/office.md"] = file13;
1525+
AllPages["advanced/corporation/optimal-selling-price-market-ta2.md"] = file14;
1526+
AllPages["advanced/corporation/product.md"] = file15;
1527+
AllPages["advanced/corporation/quality.md"] = file16;
1528+
AllPages["advanced/corporation/smart-supply.md"] = file17;
1529+
AllPages["advanced/corporation/unlocks-upgrade-research.md"] = file18;
1530+
AllPages["advanced/corporation/warehouse.md"] = file19;
1531+
AllPages["advanced/corporation/wilson-analytics-advert.md"] = file20;
1532+
AllPages["advanced/corporations.md"] = file21;
1533+
AllPages["advanced/faction_list.md"] = file22;
1534+
AllPages["advanced/gang.md"] = file23;
1535+
AllPages["advanced/grafting.md"] = file24;
1536+
AllPages["advanced/hacknetservers.md"] = file25;
1537+
AllPages["advanced/intelligence.md"] = file26;
1538+
AllPages["advanced/offlineandbonustime.md"] = file27;
1539+
AllPages["advanced/sleeves.md"] = file28;
1540+
AllPages["advanced/sourcefiles.md"] = file29;
1541+
AllPages["advanced/stanek.md"] = file30;
1542+
AllPages["basic/augmentations.md"] = file31;
1543+
AllPages["basic/autocomplete_help.md"] = file32;
1544+
AllPages["basic/codingcontracts.md"] = file33;
1545+
AllPages["basic/companies.md"] = file34;
1546+
AllPages["basic/crimes.md"] = file35;
1547+
AllPages["basic/factions.md"] = file36;
1548+
AllPages["basic/hacking.md"] = file37;
1549+
AllPages["basic/hacknet_nodes.md"] = file38;
1550+
AllPages["basic/infiltration.md"] = file39;
1551+
AllPages["basic/programs.md"] = file40;
1552+
AllPages["basic/ram.md"] = file41;
1553+
AllPages["basic/reputation.md"] = file42;
1554+
AllPages["basic/scripts.md"] = file43;
1555+
AllPages["basic/servers.md"] = file44;
1556+
AllPages["basic/stats.md"] = file45;
1557+
AllPages["basic/stockmarket.md"] = file46;
1558+
AllPages["basic/terminal.md"] = file47;
1559+
AllPages["basic/world.md"] = file48;
1560+
AllPages["changelog-v0.md"] = file49;
1561+
AllPages["changelog-v1.md"] = file50;
1562+
AllPages["changelog.md"] = file51;
1563+
AllPages["help/getting_started.md"] = file52;
1564+
AllPages["help/tools_and_resources.md"] = file53;
1565+
AllPages["index.md"] = file54;
1566+
AllPages["migrations/ns2.md"] = file55;
1567+
AllPages["migrations/v1.md"] = file56;
1568+
AllPages["migrations/v2.md"] = file57;
1569+
AllPages["programming/game_frozen.md"] = file58;
1570+
AllPages["programming/go_algorithms.md"] = file59;
1571+
AllPages["programming/hackingalgorithms.md"] = file60;
1572+
AllPages["programming/learn.md"] = file61;
1573+
AllPages["programming/react.md"] = file62;
1574+
AllPages["programming/remote_api.md"] = file63;
15751575
AllPages["nsDoc/bitburner.activefragment.highestcharge.md"] = nsDoc_bitburner_activefragment_highestcharge_md;
15761576
AllPages["nsDoc/bitburner.activefragment.id.md"] = nsDoc_bitburner_activefragment_id_md;
15771577
AllPages["nsDoc/bitburner.activefragment.md"] = nsDoc_bitburner_activefragment_md;

0 commit comments

Comments
 (0)