Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
community
fsug.in
Commits
575811db
Commit
575811db
authored
Sep 20, 2018
by
Bady
Browse files
Fix merge conflicts in MR5
parents
31b6d880
6c358532
Changes
1
Hide whitespace changes
Inline
Side-by-side
js/locations.js
View file @
575811db
...
...
@@ -210,8 +210,8 @@ var locations = [{
"
MATURL
"
:
""
,
"
TGURL
"
:
""
},
{
"
LAT
"
:
"
28.
6
140
"
,
"
LNG
"
:
"
77.
209
0
"
,
"
LAT
"
:
"
28.
7
140
"
,
"
LNG
"
:
"
77.
300
0
"
,
"
TITLE
"
:
"
NDBUG (New Delhi BSD User Group)
"
,
"
URL
"
:
"
http://ndbug.in
"
,
"
MLIST
"
:
""
,
...
...
Bady
@bady
mentioned in issue
#3 (closed)
·
Sep 19, 2018
mentioned in issue
#3 (closed)
mentioned in issue #3
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment