resolved merge conflict
This commit is contained in:
@@ -188,7 +188,162 @@
|
||||
"address" : "50",
|
||||
"description" : "Speech 1: \"You're good! But I'm still the Champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 29,
|
||||
"address" : "51",
|
||||
"description" : "Speech 2: \"Twenty\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 30,
|
||||
"address" : "52",
|
||||
"description" : "Speech 3: \"Seconds\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 31,
|
||||
"address" : "53",
|
||||
"description" : "Speech 4: \"Five, Four, Three, Two, One.\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 32,
|
||||
"address" : "54",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 33,
|
||||
"address" : "55",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 34,
|
||||
"address" : "56",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 35,
|
||||
"address" : "57",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 36,
|
||||
"address" : "58",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 37,
|
||||
"address" : "59",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 38,
|
||||
"address" : "60",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 39,
|
||||
"address" : "61",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 40,
|
||||
"address" : "62",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 41,
|
||||
"address" : "63",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 42,
|
||||
"address" : "64",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 43,
|
||||
"address" : "65",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 44,
|
||||
"address" : "66",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 45,
|
||||
"address" : "67",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 46,
|
||||
"address" : "68",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 47,
|
||||
"address" : "69",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 48,
|
||||
"address" : "70",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 49,
|
||||
"address" : "71",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 50,
|
||||
"address" : "72",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 51,
|
||||
"address" : "73",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 52,
|
||||
"address" : "74",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 53,
|
||||
"address" : "75",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
},
|
||||
{
|
||||
"id" : 54,
|
||||
"address" : "76",
|
||||
"description" : "speech 1: \"you're good! but i'm still the champ!\"",
|
||||
"extender" : "extender_0"
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user