RlxChap2
diff --git a/‎apps/1022248949865791588.json‎
Lines changed: 4 additions & 4 deletions b/‎apps/1022248949865791588.json‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎apps/1025084469306200064.json‎
Lines changed: 16 additions & 0 deletions b/‎apps/1025084469306200064.json‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎apps/1067552066454695965.json‎
Lines changed: 2 additions & 2 deletions b/‎apps/1067552066454695965.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎apps/1080277149623271444.json‎
Lines changed: 33 additions & 0 deletions b/‎apps/1080277149623271444.json‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎apps/1113966530531704943.json‎
Lines changed: 23 additions & 1 deletion b/‎apps/1113966530531704943.json‎
Lines changed: 23 additions & 1 deletion
diff --git a/‎apps/1124349960545128580.json‎
Lines changed: 7 additions & 0 deletions b/‎apps/1124349960545128580.json‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎apps/1124349969906815007.json‎
Lines changed: 5 additions & 1 deletion b/‎apps/1124349969906815007.json‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎apps/1124349971735511050.json‎
Lines changed: 10 additions & 0 deletions b/‎apps/1124349971735511050.json‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎apps/1124349973711036548.json‎
Lines changed: 4 additions & 4 deletions b/‎apps/1124349973711036548.json‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎apps/1124349977460744242.json‎
Lines changed: 10 additions & 0 deletions b/‎apps/1124349977460744242.json‎
Lines changed: 10 additions & 0 deletions
@@ -29,14 +29,14 @@
             "distributor": "steam",
             "id": "1446780"
         },
-        {
-            "distributor": "steam",
-            "id": "22570"
-        },
         {
             "distributor": "xbox",
             "id": "9P1K4FCX2SB9"
         },
+        {
+            "distributor": "steam",
+            "id": "22570"
+        },
         {
             "distributor": "xbox",
             "id": "9N1VP8WDQK4D"
 
@@ -22,6 +22,7 @@
     "themes": [],
     "third_party_skus": [
         {
+<<<<<<< HEAD
             "distributor": "steam",
             "id": "1880360"
         },
@@ -32,6 +33,10 @@
         {
             "distributor": "steam",
             "id": "1836450"
+=======
+            "distributor": "steam",
+            "id": "24917"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         },
         {
             "distributor": "xbox",
@@ -40,6 +45,17 @@
         {
             "distributor": "xbox",
             "id": "9PJLC270670N"
+<<<<<<< HEAD
+=======
+        },
+        {
+            "distributor": "steam",
+            "id": "1836450"
+        },
+        {
+            "distributor": "steam",
+            "id": "1880360"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         }
     ]
 }
@@ -1,7 +1,7 @@
 {
     "aliases": [
-        "MARVEL SNAP",
-        "마블스냅"
+        "마블스냅",
+        "MARVEL SNAP"
     ],
     "cover_image_hash": "9e24e4a048bba15726014a2d1262f68f",
     "executables": [
 
@@ -1,10 +1,18 @@
 {
     "aliases": [
+<<<<<<< HEAD
         "Хогвартс. Наследие",
         "霍格華茲的傳承",
         "Hogwarts Legacy : L'Héritage de Poudlard",
         "Hogwarts Legacy",
         "ホグワーツ・レガシー"
+=======
+        "Hogwarts Legacy : L'Héritage de Poudlard",
+        "ホグワーツ・レガシー",
+        "Хогвартс. Наследие",
+        "Hogwarts Legacy",
+        "霍格華茲的傳承"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
     ],
     "cover_image_hash": "bccd22a006dc2c0dd988baddc37873ff",
     "executables": [
@@ -30,15 +38,21 @@
     ],
     "third_party_skus": [
         {
+<<<<<<< HEAD
             "distributor": "playstation",
             "id": "CUSA12824_00"
+=======
+            "distributor": "xbox",
+            "id": "9MT5NJ5W7B8Z"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         },
         {
             "distributor": "epic",
             "id": "E97659B501AF4E3981D5430DAD170911"
         },
         {
             "distributor": "xbox",
+<<<<<<< HEAD
             "id": "9MT5NJ5W7B8Z"
         },
         {
@@ -56,10 +70,29 @@
         {
             "distributor": "steam",
             "id": "990080"
+=======
+            "id": "9NK4NTBFWW81"
+        },
+        {
+            "distributor": "playstation",
+            "id": "CUSA12824_00"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
+        },
+        {
+            "distributor": "xbox",
+            "id": "9MW10GX140N1"
         },
         {
             "distributor": "xbox",
             "id": "9PHFP0XQWZDL"
+        },
+        {
+            "distributor": "playstation",
+            "id": "PPSA01593_00"
+        },
+        {
+            "distributor": "epic",
+            "id": "E97659B501AF4E3981D5430DAD170911"
         }
     ]
 }
@@ -26,24 +26,44 @@
     ],
     "third_party_skus": [
         {
+<<<<<<< HEAD
+=======
+            "distributor": "xbox",
+            "id": "9N8RTHCPR5ZC"
+        },
+        {
+            "distributor": "xbox",
+            "id": "9NTVC9XDJPNL"
+        },
+        {
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
             "distributor": "steam",
             "id": "2344520"
         },
         {
             "distributor": "xbox",
-            "id": "9PP97VC2BL8H"
+            "id": "9P5F369NJ9PG"
         },
         {
             "distributor": "xbox",
+<<<<<<< HEAD
             "id": "9NTVC9XDJPNL"
         },
         {
             "distributor": "xbox",
             "id": "9N8RTHCPR5ZC"
+=======
+            "id": "9PP97VC2BL8H"
+        },
+        {
+            "distributor": "playstation",
+            "id": "PPSA02442_00"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         },
         {
             "distributor": "igdb",
             "id": "125165"
+<<<<<<< HEAD
         },
         {
             "distributor": "xbox",
@@ -52,6 +72,8 @@
         {
             "distributor": "playstation",
             "id": "PPSA02442_00"
+=======
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         }
     ]
 }
@@ -23,6 +23,13 @@
     ],
     "third_party_skus": [
         {
+<<<<<<< HEAD
+=======
+            "distributor": "playstation",
+            "id": "CUSA17293_00"
+        },
+        {
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
             "distributor": "steam",
             "id": "967050"
         },
 
@@ -6,7 +6,7 @@
     "executables": [
         {
             "is_launcher": false,
-            "name": "tmodloader/tmodloader.exe",
+            "name": "6.0.0/dotnet.exe",
             "os": "win32"
         },
         {
@@ -21,7 +21,11 @@
         },
         {
             "is_launcher": false,
+<<<<<<< HEAD
             "name": "6.0.0/dotnet.exe",
+=======
+            "name": "tmodloader/tmodloader.exe",
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
             "os": "win32"
         }
     ],
 
@@ -24,16 +24,26 @@
     ],
     "third_party_skus": [
         {
+<<<<<<< HEAD
+=======
+            "distributor": "playstation",
+            "id": "PPSA02828_00"
+        },
+        {
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
             "distributor": "xbox",
             "id": "9N872VFSPPQL"
         },
         {
             "distributor": "steam",
             "id": "843380"
+<<<<<<< HEAD
         },
         {
             "distributor": "playstation",
             "id": "PPSA02828_00"
+=======
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         }
     ]
 }
@@ -25,13 +25,13 @@
         "Stealth"
     ],
     "third_party_skus": [
-        {
-            "distributor": "steam",
-            "id": "1274570"
-        },
         {
             "distributor": "epic",
             "id": "9B5C3F71934E42CA9AFD669D90508FA3"
+        },
+        {
+            "distributor": "steam",
+            "id": "1274570"
         }
     ]
 }
@@ -26,16 +26,26 @@
         {
             "distributor": "playstation",
             "id": "PPSA06081_00"
+<<<<<<< HEAD
+=======
+        },
+        {
+            "distributor": "playstation",
+            "id": "CUSA29952_00"
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
         },
         {
             "distributor": "epic",
             "id": "FFE512FA1E594EE6A75D4643D1E21B43"
         },
         {
+<<<<<<< HEAD
             "distributor": "playstation",
             "id": "CUSA29952_00"
         },
         {
+=======
+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a
             "distributor": "steam",
             "id": "508440"
         },
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`"themes": [],`
`23`	`23`	`"third_party_skus": [`
`24`	`24`	`{`
	`25`	`+<<<<<<< HEAD`
`25`	`26`	`"distributor": "steam",`
`26`	`27`	`"id": "1880360"`
`27`	`28`	`},`
`@@ -32,6 +33,10 @@`
`32`	`33`	`{`
`33`	`34`	`"distributor": "steam",`
`34`	`35`	`"id": "1836450"`
	`36`	`+=======`
	`37`	`+ "distributor": "steam",`
	`38`	`+ "id": "24917"`
	`39`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`35`	`40`	`},`
`36`	`41`	`{`
`37`	`42`	`"distributor": "xbox",`
`@@ -40,6 +45,17 @@`
`40`	`45`	`{`
`41`	`46`	`"distributor": "xbox",`
`42`	`47`	`"id": "9PJLC270670N"`
	`48`	`+<<<<<<< HEAD`
	`49`	`+=======`
	`50`	`+ },`
	`51`	`+ {`
	`52`	`+ "distributor": "steam",`
	`53`	`+ "id": "1836450"`
	`54`	`+ },`
	`55`	`+ {`
	`56`	`+ "distributor": "steam",`
	`57`	`+ "id": "1880360"`
	`58`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`43`	`59`	`}`
`44`	`60`	`]`
`45`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,24 +26,44 @@`
`26`	`26`	`],`
`27`	`27`	`"third_party_skus": [`
`28`	`28`	`{`
	`29`	`+<<<<<<< HEAD`
	`30`	`+=======`
	`31`	`+ "distributor": "xbox",`
	`32`	`+ "id": "9N8RTHCPR5ZC"`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "distributor": "xbox",`
	`36`	`+ "id": "9NTVC9XDJPNL"`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`29`	`40`	`"distributor": "steam",`
`30`	`41`	`"id": "2344520"`
`31`	`42`	`},`
`32`	`43`	`{`
`33`	`44`	`"distributor": "xbox",`
`34`		`- "id": "9PP97VC2BL8H"`
	`45`	`+ "id": "9P5F369NJ9PG"`
`35`	`46`	`},`
`36`	`47`	`{`
`37`	`48`	`"distributor": "xbox",`
	`49`	`+<<<<<<< HEAD`
`38`	`50`	`"id": "9NTVC9XDJPNL"`
`39`	`51`	`},`
`40`	`52`	`{`
`41`	`53`	`"distributor": "xbox",`
`42`	`54`	`"id": "9N8RTHCPR5ZC"`
	`55`	`+=======`
	`56`	`+ "id": "9PP97VC2BL8H"`
	`57`	`+ },`
	`58`	`+ {`
	`59`	`+ "distributor": "playstation",`
	`60`	`+ "id": "PPSA02442_00"`
	`61`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`43`	`62`	`},`
`44`	`63`	`{`
`45`	`64`	`"distributor": "igdb",`
`46`	`65`	`"id": "125165"`
	`66`	`+<<<<<<< HEAD`
`47`	`67`	`},`
`48`	`68`	`{`
`49`	`69`	`"distributor": "xbox",`
`@@ -52,6 +72,8 @@`
`52`	`72`	`{`
`53`	`73`	`"distributor": "playstation",`
`54`	`74`	`"id": "PPSA02442_00"`
	`75`	`+=======`
	`76`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`55`	`77`	`}`
`56`	`78`	`]`
`57`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"executables": [`
`7`	`7`	`{`
`8`	`8`	`"is_launcher": false,`
`9`		`- "name": "tmodloader/tmodloader.exe",`
	`9`	`+ "name": "6.0.0/dotnet.exe",`
`10`	`10`	`"os": "win32"`
`11`	`11`	`},`
`12`	`12`	`{`
`@@ -21,7 +21,11 @@`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"is_launcher": false,`
	`24`	`+<<<<<<< HEAD`
`24`	`25`	`"name": "6.0.0/dotnet.exe",`
	`26`	`+=======`
	`27`	`+ "name": "tmodloader/tmodloader.exe",`
	`28`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`25`	`29`	`"os": "win32"`
`26`	`30`	`}`
`27`	`31`	`],`
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,26 @@`
`24`	`24`	`],`
`25`	`25`	`"third_party_skus": [`
`26`	`26`	`{`
	`27`	`+<<<<<<< HEAD`
	`28`	`+=======`
	`29`	`+ "distributor": "playstation",`
	`30`	`+ "id": "PPSA02828_00"`
	`31`	`+ },`
	`32`	`+ {`
	`33`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`27`	`34`	`"distributor": "xbox",`
`28`	`35`	`"id": "9N872VFSPPQL"`
`29`	`36`	`},`
`30`	`37`	`{`
`31`	`38`	`"distributor": "steam",`
`32`	`39`	`"id": "843380"`
	`40`	`+<<<<<<< HEAD`
`33`	`41`	`},`
`34`	`42`	`{`
`35`	`43`	`"distributor": "playstation",`
`36`	`44`	`"id": "PPSA02828_00"`
	`45`	`+=======`
	`46`	`+>>>>>>> b1e10f77f9f78d9268b9cf13ef3b6952f557f50a`
`37`	`47`	`}`
`38`	`48`	`]`
`39`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@`
`25`	`25`	`"Stealth"`
`26`	`26`	`],`
`27`	`27`	`"third_party_skus": [`
`28`		`- {`
`29`		`- "distributor": "steam",`
`30`		`- "id": "1274570"`
`31`		`- },`
`32`	`28`	`{`
`33`	`29`	`"distributor": "epic",`
`34`	`30`	`"id": "9B5C3F71934E42CA9AFD669D90508FA3"`
	`31`	`+ },`
	`32`	`+ {`
	`33`	`+ "distributor": "steam",`
	`34`	`+ "id": "1274570"`
`35`	`35`	`}`
`36`	`36`	`]`
`37`	`37`	`}`