From d15d2e8df421cf7a50f0b7b0ff9da49727076fd0 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 11 May 2021 11:23:33 +0300
Subject: [PATCH] Sync the README with the master branch.
---
README.rst | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/README.rst b/README.rst
index e63cc78..112af41 100644
--- a/README.rst
+++ b/README.rst
@@ -1,18 +1,14 @@
-Nimrod Adar's resume
+Nimrod Adar's résumé
====================
.. image:: https://git.shore.co.il/nimrod/resume/badges/nimrod/pipeline.svg
:target: https://git.shore.co.il/nimrod/resume/-/commits/nimrod
:alt: pipeline status
-My resume in RestructureText, make targets for generating PDF, HTML, ODT and
-DOCX versions and uploading to my web server. The pre-prepared version are
-available `here <https://www.shore.co.il/blog/pages/about-me.html>`_. The
-version in the master branch is generic and without my resume, in the nimrod
-branch are my resume and specific settings.
->>>>>>> ef83aca... Rebase on the master branch.
+A tiny framework to generate your résumé from whatever markup that
+suits you (and that Pandoc can read).
-My own resume is in the :code:`nimrod` branch, the outputed files can be found
+My own résumé is in the :code:`nimrod` branch, the outputed files can be found
in my `about me <https://www.shore.co.il/blog/pages/about-me.html>`_ page.
Dependencies
--
GitLab