diff options
Diffstat (limited to 'more/getting_started/windows.html')
| -rw-r--r-- | more/getting_started/windows.html | 4 |
1 files changed, 0 insertions, 4 deletions
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> |