mirror of
https://github.com/placeAtlas/atlas.git
synced 2024-11-02 21:59:41 +01:00
resolved conflicting commit issue
This commit is contained in:
parent
5f7ebb5a5e
commit
8131c3e714
1 changed files with 1 additions and 1 deletions
|
@ -1385,7 +1385,7 @@
|
|||
{"id": "twqy9f", "submitted_by": "Garchomprocks", "name": "Leaves From the Vine", "description": "A depiction of a scene from Avatar: The Last Airbender of Uncle Iroh mourning his son Lu Ten. This scene was also used by the show to pay tribute to Mako, the late original voice actor of Uncle Iroh.", "website": "", "subreddit": "r/atla", "center": [1415.5, 1554.5], "path": [[1332.5, 1497.5], [1332.5, 1611.5], [1498.5, 1611.5], [1498.5, 1498.5], [1332.5, 1497.5]]},
|
||||
{"id": "twqxsf", "submitted_by": "yamirzmmdx", "name": "Liverpool FC", "description": "We've conquered all of EuropenWe're never going to stopnFrom Paris down to TurkeynWe've won the fucking lotnBob Paisley and Bill ShanklynThe fields of Anfield RoadnWe are loyal supportersnAnd we come from Liverpool!nYNWA.", "website": "", "subreddit": "/r/LiverpoolFC", "center": [1229.5, 537.5], "path": [[1207.5, 508.5], [1207.5, 567.5], [1250.5, 567.5], [1250.5, 507.5], [1207.5, 508.5]]},
|
||||
{"id": "twqxe8", "submitted_by": "Explodingmemes", "name": "Maryland Flag", "description": "The flag of Maryland is famous for its odd composition and colors. ", "website": "", "subreddit": "/r/Maryland", "center": [267.5, 19.5], "path": [[232.5, 14.5], [248.5, 14.5], [248.5, 0.5], [296.5, 0.5], [297.5, 35.5], [232.5, 35.5], [232.5, 15.5], [232.5, 14.5]]},
|
||||
{"id": "twqxc9", "submitted_by": "fectoelfilis", "name": "Tails Gets Trolled", "description": "Pixel art of the meme (..or webcomic) Tails Gets Trolled.", "website": "tailsgetstrolled.org", "subreddit": "", "center": [1816.5, 1626.5], "path": [[1810.5, 1616.5], [1824.5, 1614.5], [1825.5, 1636.5], [1811.5, 1637.5], [1814.5, 1637.5], [1812.5, 1636.5], [1808.5, 1635.5], [1810.5, 1637.5], [1824.5, 1639.5], [1807.5, 1639.5], [1808.5, 1616.5], [1814.5, 1612.5], [1811.5, 1613.5], [1824.5, 1613.5], [1827.5, 1612.5], [1818.5, 1613.5], [1817.5, 1613.5]]},
|
||||
{"id": "twqxc9", "name": "Tails Gets Trolled", "description": "The official logo and iconic Tails Gets Trolled face from the webcomic of the same name.", "website": "http://www.tailsgetstrolled.org", "subreddit": "/r/RealTailsGetsTrolled", "center": [1817.5, 1625.5], "path": [[1809.5, 1612.5], [1809.5, 1638.5], [1825.5, 1638.5], [1825.5, 1612.5]]},
|
||||
{"id": "twqxab", "submitted_by": "mamasbreads", "name": "Spanish Coat of Arms", "description": "Found on the Spanish flag, the coat of arms is composed of the four medieval kingdoms which formed Spain: Castilla (top-left), Leon (top-right), Aragon (bottom-left), and Navarra (bottom-right). The Spanish crown is on top of the coat of arms, while on either side are the Pillars of Hercules from Greek mythology. ", "website": "", "subreddit": "/r/esplace", "center": [1413.5, 296.5], "path": [[1396.5, 279.5], [1396.5, 313.5], [1430.5, 313.5], [1429.5, 279.5]]},
|
||||
{"id": "twqx4v", "submitted_by": "oski165", "name": "Helltaker", "description": "A picture of a character from a small Polish videogame Helltaker named Lucifer along with a small logo", "website": "", "subreddit": "", "center": [1990.5, 1254.5], "path": [[1981.5, 1237.5], [1981.5, 1271.5], [1998.5, 1271.5], [1999.5, 1237.5]]},
|
||||
{"id": "twqx0n", "submitted_by": "FakeGoonmachine", "name": "Ironman Mode", "description": "These three helmets represent 3 'Ironman' game modes within RuneScape: Standard, Hardcore, and Ultimate. Ironman Mode is an account type that requires the player to be entirely self-sufficient. Ironmen are locked out of or restricted in most forms of interactions with other players such as trading, the Grand Exchange, PvP, most group minigames, and almost all other group activities.", "website": "https://oldschool.runescape.wiki/w/Ironman_Mode", "subreddit": "/r/ironscape", "center": [90.5, 42.5], "path": [[63.5, 50.5], [63.5, 34.5], [117.5, 34.5], [117.5, 50.5], [63.5, 50.5]]},
|
||||
|
|
Loading…
Reference in a new issue