boost/more
1
0
Fork 0
mirror of https://github.com/boostorg/more.git synced 2024-12-25 23:20:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict markers

Browse Source
This commit is contained in:
Peter Dimov 2020-02-24 19:38:39 +02:00
parent 36bda659a4
commit c7cefb28ad
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
getting_started/index.html
View File

@ -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>

4
getting_started/unix-variants.html
View File

@ -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" />

4
getting_started/windows.html
View File

@ -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>