Post edit

blog/feed.rss

@@ -2,14 +2,23 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <channel><title>~g1n's blog</title><link>https://xhec.one/~g1n/index.html</link>
 <description>~g1n's blog</description><language>en</language>
+<<<<<<< HEAD
 <lastBuildDate>Mon, 03 May 2021 09:05:35 -0400</lastBuildDate>
 <pubDate>Mon, 03 May 2021 09:05:35 -0400</pubDate>
+=======
+<lastBuildDate>Mon, 03 May 2021 09:02:30 -0400</lastBuildDate>
+<pubDate>Mon, 03 May 2021 09:02:30 -0400</pubDate>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 <atom:link href="https://xhec.one/~g1n/feed.rss" rel="self" type="application/rss+xml" />
 <item><title>
 Setting up exwm
 </title><description><![CDATA[
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->

blog/index.html

@@ -23,7 +23,11 @@ G1n
 </div>
 <!-- text begin -->
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->

blog/setting-up-exwm.html

@@ -24,7 +24,11 @@ G1n
 </div>
 <!-- text begin -->
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->

blog/tag_emacs-for-everything.html

@@ -23,7 +23,11 @@ G1n
 </div>
 <!-- text begin -->
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->

blog/tag_emacs.html

@@ -23,7 +23,11 @@ G1n
 </div>
 <!-- text begin -->
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->

blog/tag_exwm.html

@@ -23,7 +23,11 @@ G1n
 </div>
 <!-- text begin -->
 
+<<<<<<< HEAD
 <p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in vim in ssh session, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+=======
+<p>I setuped main global keybindings, now I can use firefox in emacs (used swaywm before). Writing this text in ssh session in vim, but going to setup ssh file access from emacs and improve orgblog (maybe I'll write a script for exporting to html from org and pushing to git repository) </p>
+>>>>>>> 58c86bd70615db7dd1e6201ce1819576784342de
 
 <p>Tags: <a href='tag_emacs.html'>emacs</a>, <a href='tag_emacs-for-everything.html'>emacs-for-everything</a>, <a href='tag_exwm.html'>exwm</a></p>
 <!-- text end -->