From 5711d723c129f146e4b763d8a0b94b161bc3e81f Mon Sep 17 00:00:00 2001 From: Saivann Date: Thu, 23 Oct 2014 14:27:44 -0400 Subject: [PATCH] Update events (fixes #613, #614) --- _events/2014-10-05-insidebitcoinslasvegas.md | 9 --------- _events/2014-10-07-coinagenda.md | 9 --------- _events/2014-10-10-hackercongress.md | 9 --------- _events/2014-10-16-BTC2B.md | 9 --------- _events/2014-10-19-insidebitcoinstelaviv.md | 9 --------- _events/2014-10-21-bitcoinlaw | 9 --------- _events/2014-11-01-indchainconf.md | 9 +++++++++ _events/2014-11-28-globalbitcoinsubmit.md | 9 +++++++++ 8 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 _events/2014-10-05-insidebitcoinslasvegas.md delete mode 100644 _events/2014-10-07-coinagenda.md delete mode 100644 _events/2014-10-10-hackercongress.md delete mode 100644 _events/2014-10-16-BTC2B.md delete mode 100644 _events/2014-10-19-insidebitcoinstelaviv.md delete mode 100644 _events/2014-10-21-bitcoinlaw create mode 100644 _events/2014-11-01-indchainconf.md create mode 100644 _events/2014-11-28-globalbitcoinsubmit.md diff --git a/_events/2014-10-05-insidebitcoinslasvegas.md b/_events/2014-10-05-insidebitcoinslasvegas.md deleted file mode 100644 index 8d4d2600..00000000 --- a/_events/2014-10-05-insidebitcoinslasvegas.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-05 -title: "Inside Bitcoins Las Vegas" -venue: "Flamingo Hotel & Casino" -address: "3555 S Las Vegas Blvd, Las Vegas, NV 89109" -city: "Las Vegas" -country: "United States" -link: "http://insidebitcoins.com/las-vegas/?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingiblv" ---- \ No newline at end of file diff --git a/_events/2014-10-07-coinagenda.md b/_events/2014-10-07-coinagenda.md deleted file mode 100644 index 8dee42cf..00000000 --- a/_events/2014-10-07-coinagenda.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-07 -title: "CoinAgenda" -venue: "Palms Casino Resort" -address: "4321 West Flamingo Road" -city: "Las Vegas, NV" -country: "United States" -link: http://coinagenda.com/ ---- diff --git a/_events/2014-10-10-hackercongress.md b/_events/2014-10-10-hackercongress.md deleted file mode 100644 index 1473f213..00000000 --- a/_events/2014-10-10-hackercongress.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-10 -title: "Hackers Congress Paralelní Polis 2014" -venue: "Paralelní polis" -address: "Dělnická 43, Praha 7 - Holešovice" -city: "Prague" -country: "Czech Republic" -link: "http://www.paralelnipolis.cz/162/hackers-congress-paralelni-polis-2014-2/" ---- diff --git a/_events/2014-10-16-BTC2B.md b/_events/2014-10-16-BTC2B.md deleted file mode 100644 index 3e76f4ec..00000000 --- a/_events/2014-10-16-BTC2B.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-16 -title: "Bitcoin 2 Business Congress" -venue: "B19 Business Club" -address: "19 Avenue Van Bever" -city: "Brussels" -country: "Belgium" -link: "http://btc2b.com/" ---- diff --git a/_events/2014-10-19-insidebitcoinstelaviv.md b/_events/2014-10-19-insidebitcoinstelaviv.md deleted file mode 100644 index 325697b1..00000000 --- a/_events/2014-10-19-insidebitcoinstelaviv.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-19 -title: "Inside Bitcoins Tel Aviv" -venue: "Kfar Maccabiah Convention Center" -address: "7 Perets Bernstein st., Ramat Gan" -city: "Tel Aviv" -country: "Israel" -link: "http://bitcointlv.com/?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibtlv" ---- \ No newline at end of file diff --git a/_events/2014-10-21-bitcoinlaw b/_events/2014-10-21-bitcoinlaw deleted file mode 100644 index 29ee702c..00000000 --- a/_events/2014-10-21-bitcoinlaw +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-10-21 -title: "Bitcoin Law: Regulation and Transactions" -venue: "New York Law School" -address: "185 West Broadway" -city: "New York" -country: "United States" -link: http://www.nyls.edu/bitcoin ---- diff --git a/_events/2014-11-01-indchainconf.md b/_events/2014-11-01-indchainconf.md new file mode 100644 index 00000000..cab2aa63 --- /dev/null +++ b/_events/2014-11-01-indchainconf.md @@ -0,0 +1,9 @@ +--- +date: 2014-11-01 +title: "The First Encrypted Digital Currency Industrial Chain Conference" +venue: "Bolifang, Shenzhen, China" +address: "Baolifang, Xinansilu Rd 198, Baoan District" +city: "Shenzhen" +country: "China" +link: "http://w5.com/" +--- diff --git a/_events/2014-11-28-globalbitcoinsubmit.md b/_events/2014-11-28-globalbitcoinsubmit.md new file mode 100644 index 00000000..105d72b2 --- /dev/null +++ b/_events/2014-11-28-globalbitcoinsubmit.md @@ -0,0 +1,9 @@ +--- +date: 2014-11-28 +title: "2014 Internet Finance Innovation CEO Summit (IFICS)—Global Bitcoin Summit" +venue: "Cyberport Hong Kong" +address: "100 Cyberport Road" +city: "Hong Kong" +country: "Hong Kong" +link: http://www.globalbtcsummit.com/ +---