diff options
Diffstat (limited to 'lib/common/BoxConfig-MSVC.h')
| -rw-r--r-- | lib/common/BoxConfig-MSVC.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/common/BoxConfig-MSVC.h b/lib/common/BoxConfig-MSVC.h index bfa0dcaf..eeb25d2e 100644 --- a/lib/common/BoxConfig-MSVC.h +++ b/lib/common/BoxConfig-MSVC.h @@ -76,12 +76,9 @@ /* Define to 1 if you have the <execinfo.h> header file. */ /* #undef HAVE_EXECINFO_H */ -<<<<<<< HEAD -======= /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 ->>>>>>> 0.12 /* Define to 1 if you have the `flock' function. */ /* #undef HAVE_FLOCK */ @@ -188,11 +185,7 @@ /* Define to 1 if you have the `setproctitle' function. */ /* #undef HAVE_SETPROCTITLE */ -<<<<<<< HEAD - -======= #define HAVE_SETPROCTITLE 1 ->>>>>>> 0.12 /* Define to 1 if you have the `setxattr' function. */ /* #undef HAVE_SETXATTR */ |