diff options
| author | Peter Dimov <pdimov@gmail.com> | 2020-02-24 19:38:39 +0200 |
|---|---|---|
| committer | Peter Dimov <pdimov@gmail.com> | 2020-02-24 19:38:39 +0200 |
| commit | 2865c5261e7485b8538694c982b3be9690d326c6 (patch) | |
| tree | 92e27ca50b8e845f23b24e71f2e8d9e6bdf56790 /more | |
| parent | 875ef5ca86e15a2b1c2348646f82ce3b0cfed9fc (diff) | |
| download | boost-2865c5261e7485b8538694c982b3be9690d326c6.tar.gz | |
Remove conflict markers
Diffstat (limited to 'more')
| -rw-r--r-- | more/getting_started/index.html | 4 | ||||
| -rw-r--r-- | more/getting_started/unix-variants.html | 4 | ||||
| -rw-r--r-- | more/getting_started/windows.html | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/more/getting_started/index.html b/more/getting_started/index.html index 7f8fd71251..f82b1e4367 100644 --- a/more/getting_started/index.html +++ b/more/getting_started/index.html @@ -3,11 +3,7 @@ <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> diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html index 7272790378..1dfb605dd8 100644 --- a/more/getting_started/unix-variants.html +++ b/more/getting_started/unix-variants.html @@ -3,11 +3,7 @@ <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 on Unix Variants</title> <meta content="Getting Started with Boost on Unix Variants (including Linux and MacOS)" name="description" /> <link rel="stylesheet" href="../../rst.css" type="text/css" /> diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html index 0429c61767..6a82ab8261 100644 --- a/more/getting_started/windows.html +++ b/more/getting_started/windows.html @@ -3,11 +3,7 @@ <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 on Windows</title> <link rel="stylesheet" href="../../rst.css" type="text/css" /> </head> |