Skip to content

Commit cd5b8ae

Browse files
committed
Correct README.md #334
1 parent 0323ccc commit cd5b8ae

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
tetengo 1.8.1
3-
=======
4-
tetengo 1.9.0
5-
>>>>>>> main
1+
tetengo 1.8.2
62
=============
73

84
[TOC]
@@ -86,13 +82,8 @@ How to Build and Install
8682
#### Requirements
8783

8884
- [Visual Studio 2022](https://visualstudio.microsoft.com/)
89-
<<<<<<< HEAD
90-
- [Boost C++ libraries 1.82.0](https://www.boost.org/)
91-
- [Doxygen 1.9.7](https://www.doxygen.nl/)
92-
=======
9385
- [Boost C++ libraries 1.86.0](https://www.boost.org/)
9486
- [Doxygen 1.12.0](https://www.doxygen.nl/)
95-
>>>>>>> main
9687
- [Graphviz](https://www.graphviz.org/)
9788
- [WiX toolset 5.0.1](https://wixtoolset.org/)
9889
- [Python 3.9](https://www.python.org/) or
@@ -151,13 +142,8 @@ Doxygen will output the documents into the directory `doc`.
151142
[Clang 14](https://clang.llvm.org/),
152143
[GCC 10](https://gcc.gnu.org/) or
153144
[GCC 12](https://gcc.gnu.org/)
154-
<<<<<<< HEAD
155-
- [Boost C++ libraries 1.82.0](https://www.boost.org/)
156-
- [Doxygen 1.9.7](https://www.doxygen.nl/)
157-
=======
158145
- [Boost C++ libraries 1.86.0](https://www.boost.org/)
159146
- [Doxygen 1.12.0](https://www.doxygen.nl/)
160-
>>>>>>> main
161147
- [Graphviz](https://www.graphviz.org/)
162148
- [include-what-you-use 0.15](https://include-what-you-use.org/) or
163149
[include-what-you-use 0.17](https://include-what-you-use.org/)

0 commit comments

Comments
 (0)