summaryrefslogtreecommitdiff
path: root/more/getting_started/index.html
diff options
context:
space:
mode:
authorMarshall Clow <marshall@idio.com>2019-12-11 10:28:45 -0800
committerMarshall Clow <marshall@idio.com>2019-12-13 18:04:24 -0800
commit542d04d0d9de4d1fde2575d8c6386e19f190c19e (patch)
tree1b5a4d4047cb8dd8a41eb58cccc73b8ad43b2bc6 /more/getting_started/index.html
parent27ffb1de6fb440b042967d5e22afa3c7ae64b077 (diff)
downloadboost-542d04d0d9de4d1fde2575d8c6386e19f190c19e.tar.gz
Bump version to 1.73
Diffstat (limited to 'more/getting_started/index.html')
-rw-r--r--more/getting_started/index.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/more/getting_started/index.html b/more/getting_started/index.html
index 73a8597470..7f8fd71251 100644
--- a/more/getting_started/index.html
+++ b/more/getting_started/index.html
@@ -3,7 +3,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<<<<<<< HEAD
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+=======
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
+>>>>>>> 444d55b49... Bump version to 1.73
<title>Boost Getting Started</title>
<link rel="stylesheet" href="../../rst.css" type="text/css" />
</head>