Bump version to 1.91

getting_started/detail/release-variables.rst

@@ -5,8 +5,16 @@
 .. This file contains all the definitions that need to be updated
 .. for each new release of Boost.
 
+<<<<<<< HEAD
 .. |boost-version-number| replace:: 90
 .. |boost_ver| replace:: ``boost_1_90_0``
 .. |boost_ver-bold| replace:: **boost_1_90_0**
 
 .. _sf-download: http://www.boost.org/users/history/version_1_90_0.html
+=======
+.. |boost-version-number| replace:: 91
+.. |boost_ver| replace:: ``boost_1_91_0``
+.. |boost_ver-bold| replace:: **boost_1_91_0**
+
+.. _sf-download: http://www.boost.org/users/history/version_1_91_0.html
+>>>>>>> 85b6cf2 (Bump to 1.91)