Skip to content

Commit

Permalink
resolving confilct
Browse files Browse the repository at this point in the history
  • Loading branch information
Aryan4884 committed Jan 31, 2025
1 parent 3a4276e commit e63cbea
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions config/city-lists.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"date": "__",
"cfpdate":"__",
"description": "__",
"img": "/img/testMic.webp",
"img": "__",
"address": "__",
"map": "__",
"sponsors": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"date": "__",
"cfpdate":"__",
"description": "__",
"img": "/img/finland.webp",
"img": "__",
"address": "__",
"map": "__",
"sponsors": {
Expand Down Expand Up @@ -70,7 +70,7 @@
"date": "__",
"cfpdate":"__",
"description": "__",
"img": "/img/london.gif",
"img": "__",
"address": "__",
"map": "__",
"sponsors": {
Expand All @@ -91,9 +91,9 @@
}
]
},
"ticket": false,
"isFree": false,
"ended": false,
"ticket": "__",
"isFree": true,
"ended": true,
"recordings":"__",
"playlist":"__"
},
Expand All @@ -103,7 +103,7 @@
"date": "__",
"cfpdate":"__",
"description": "__",
"img": "https://media1.giphy.com/media/v1.Y2lkPTc5MGI3NjExd24yenR4djEyZzRoeDA0ZmEyb3Y1c2F4NWVmbG13NmZwYWNhZzdnNiZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/Tuy3QxNZF1cxG/giphy.gif",
"img": "__",
"address": "__",
"map": "__",
"sponsors": {
Expand All @@ -124,7 +124,7 @@
}
]
},
"ticket": false,
"ticket": "__",
"isFree": false,
"cfp": false,
"ended": false
Expand Down

0 comments on commit e63cbea

Please sign in to comment.