Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-30 13:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

conflict resolution

Browse source
This commit is contained in:
eduard 2012-12-30 13:46:07 +01:00
parent fb25f407fb
commit 98103e15eb
2 changed files with 1 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/misc/stringops.hpp
View file

@ -2,10 +2,7 @@
#define MISC_STRINGOPS_H
#include <string>
<<<<<<< HEAD
=======
#include <algorithm>
>>>>>>> 92623921add0d6e16a34973dcf6f2ee1f52dbbe7
namespace Misc
{