Browse Source

Fix merge issue

master
Abheek Dhawan 4 years ago
parent
commit
26796b1366
  1. 4
      index.js

4
index.js

@ -18,11 +18,7 @@ client.on("message", async message => {
memberCount(message); memberCount(message);
break; break;
case '$addroles': case '$addroles':
<<<<<<< HEAD
execSync("wget --no-check-certificate --output-document=participants.csv https://docs.google.com/spreadsheets/d/1lufn28YR29OkCS4wH_WQXfCalAgJRi8_r4NCesJSbQY/export?gid=2119488170&format=csv", { encoding: 'utf-8' }); execSync("wget --no-check-certificate --output-document=participants.csv https://docs.google.com/spreadsheets/d/1lufn28YR29OkCS4wH_WQXfCalAgJRi8_r4NCesJSbQY/export?gid=2119488170&format=csv", { encoding: 'utf-8' });
=======
execSync("wget --no-check-certificate --output-document=participants.csv https://docs.google.com/spreadsheets/d/1lufn28YR29OkCS4wH_WQXfCalAgJRi8_r4NCesJSbQY/export\?gid\=2119488170\&format\=csv");
>>>>>>> 3bedb1dfbcc1fdeb578036de4d9aadff3879f57f
csv().fromFile('participants.csv') csv().fromFile('participants.csv')
.then(users => { .then(users => {
users.forEach(function (user) { users.forEach(function (user) {

Loading…
Cancel
Save