From ee7b9550f4ed3b1b4b8a11917c944340303048bf Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 18 Oct 2018 20:56:18 -0500
Subject: [PATCH] Concession: Update

---
 .concession                   | 2 +-
 .config/liferea/feedlist.opml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.concession b/.concession
index d38e39ed..3740525d 160000
--- a/.concession
+++ b/.concession
@@ -1 +1 @@
-Subproject commit d38e39ed2fbd1442f098bee9f838ca7012a89e6f
+Subproject commit 3740525d96330753a0243020aebdd8efbbfabda7
diff --git a/.config/liferea/feedlist.opml b/.config/liferea/feedlist.opml
index 6dedd9e4..301df1f6 100644
--- a/.config/liferea/feedlist.opml
+++ b/.config/liferea/feedlist.opml
@@ -35,6 +35,13 @@
           <outline title="YourMovieSucksDOTorg" text="YourMovieSucksDOTorg" description="YourMovieSucksDOTorg" type="atom" id="fundidx" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UCSc16oMxxlcJSb9SXkjwMjA" htmlUrl="https://www.youtube.com/channel/UCSc16oMxxlcJSb9SXkjwMjA" updateInterval="-1" collapsed="true"/>
           <outline title="Mark Brown" text="Mark Brown" description="Mark Brown" type="atom" id="gkmpnqg" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?user=McBacon1337" htmlUrl="https://www.youtube.com/channel/UCqJ-Xo29CKyLTjn6z2XwYAw" updateInterval="-1" collapsed="true"/>
         </outline>
+        <outline title="Talks" text="Talks" description="Talks" type="folder" id="gqnxbir" sortColumn="time" collapsed="true">
+          <outline title="Hacking" text="Hacking" description="Hacking" type="folder" id="uyupfjk" sortColumn="time" collapsed="true">
+            <outline title="Shakacon LLC" text="Shakacon LLC" description="Shakacon LLC" type="atom" id="pdodnfg" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?user=ShakaconITConference" htmlUrl="https://www.youtube.com/channel/UCIvytJLrQS3x8lTusvTLaOQ" updateInterval="-1" collapsed="true"/>
+            <outline title="DEFCONConference" text="DEFCONConference" description="DEFCONConference" type="atom" id="wexfxty" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UC6Om9kAkl32dWlDSNlDS9Iw" htmlUrl="https://www.youtube.com/channel/UC6Om9kAkl32dWlDSNlDS9Iw" updateInterval="-1" collapsed="true"/>
+            <outline title="Black Hat" text="Black Hat" description="Black Hat" type="atom" id="qjhrhjr" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UCJ6q9Ie29ajGqKApbLqfBOg" htmlUrl="https://www.youtube.com/channel/UCJ6q9Ie29ajGqKApbLqfBOg" updateInterval="-1" collapsed="true"/>
+          </outline>
+        </outline>
         <outline title="Games" text="Games" description="Games" type="folder" id="arsudsq" sortColumn="time" collapsed="true">
           <outline title="TF2" text="TF2" description="TF2" type="folder" id="pslrnmd" sortColumn="time" collapsed="true">
             <outline title="LazyPurple" text="LazyPurple" description="LazyPurple" type="atom" id="yfgemtp" sortColumn="time" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UCdfj8hli-xBL93bfQvce88A" htmlUrl="https://www.youtube.com/channel/UCdfj8hli-xBL93bfQvce88A" updateInterval="-1" collapsed="true"/>