scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-10-30 02:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix README and libversion merge conflict

Browse Source
This commit is contained in:
Günter Obiltschnig
2017-09-09 10:00:45 +02:00
parent ef59b4bd67
commit 6ade50b1ab
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -6,6 +6,8 @@ Build Status
- Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=poco-1.8.0)](https://travis-ci.org/pocoproject/poco) - Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=poco-1.8.0)](https://travis-ci.org/pocoproject/poco)
- AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/poco-1.8.0?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/poco-1.8.0) - AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/poco-1.8.0?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/poco-1.8.0)
- [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)
![alt text][logo] ![alt text][logo]
@@ -35,6 +37,7 @@ Side-by-side use of Boost and POCO is a very common occurrence.
When contributing to POCO, please adhere to our [guidelines](https://github.com/pocoproject/poco/blob/develop/CONTRIBUTING.md). When contributing to POCO, please adhere to our [guidelines](https://github.com/pocoproject/poco/blob/develop/CONTRIBUTING.md).
All text file line endings in the repository must be Unix-style (LF). All text file line endings in the repository must be Unix-style (LF).
This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters). This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters).

4
libversion
View File

@@ -1,5 +1 @@
<<<<<<< HEAD
50 50
=======
49
>>>>>>> poco-1.7.9