[taler-anastasis] branch master updated: conflict? this file is generated

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new b43c8f6  conflict? this file is generated
b43c8f6 is described below

commit b43c8f6ecb7be0a659e5682ba7fc1cc88963a5f8
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jan 21 12:18:14 2020 +0100

    conflict? this file is generated
---
 ...is_config (conflicted copy 2019-12-13 143618).h | 290 ---------------------
 1 file changed, 290 deletions(-)

diff --git a/anastasis_config (conflicted copy 2019-12-13 143618).h 
b/anastasis_config (conflicted copy 2019-12-13 143618).h
deleted file mode 100644
index 9da8ea4..0000000
--- a/anastasis_config (conflicted copy 2019-12-13 143618).h    
+++ /dev/null
@@ -1,290 +0,0 @@
-/* anastasis_config.h.  Generated from anastasis_config.h.in by configure.  */
-/* anastasis_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to cull all logging calls */
-/* #undef GNUNET_CULL_LOGGING */
-
-/* 1 if extra logging is enabled, 2 for very verbose extra logging, 0
-   otherwise */
-#define GNUNET_EXTRA_LOGGING 1
-
-/* Define to 1 if you have the <curl/curl.h> header file. */
-#define HAVE_CURL_CURL_H 1
-
-/* Define to 1 if you have the declaration of `CURLINFO_TLS_SESSION', and to 0
-   if you don't. */
-#define HAVE_DECL_CURLINFO_TLS_SESSION 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <gnunet/gnunet_pq_lib.h> header file. */
-#define HAVE_GNUNET_GNUNET_PQ_LIB_H 1
-
-/* Define to 1 if you have the <gnunet/gnunet_util_lib.h> header file. */
-#define HAVE_GNUNET_GNUNET_UTIL_LIB_H 1
-
-/* Define to 1 if you have the <gnunet/platform.h> header file. */
-#define HAVE_GNUNET_PLATFORM_H 1
-
-/* Define to 1 if you have the <gnurl/curl.h> header file. */
-/* #undef HAVE_GNURL_CURL_H */
-
-/* Define to 1 if the system has the type `intmax_t'. */
-#define HAVE_INTMAX_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Have CURL */
-#define HAVE_LIBCURL 1
-
-/* Define to 1 if you have the `curl-gnutls' library (-lcurl-gnutls). */
-/* #undef HAVE_LIBCURL_GNUTLS */
-
-/* Have libgnurl */
-#define HAVE_LIBGNURL 1
-
-/* Define to 1 if the system has the type `long long int'. */
-#define HAVE_LONG_LONG_INT 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if PostgreSQL libraries are available */
-#define HAVE_POSTGRESQL 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <taler/taler_twister_testing_lib.h> header
-   file. */
-/* #undef HAVE_TALER_TALER_TWISTER_TESTING_LIB_H */
-
-/* Define to 1 if the system has the type `uintmax_t'. */
-#define HAVE_UINTMAX_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type `unsigned long long int'. */
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-
-/* Defined if libcurl supports AsynchDNS */
-#define LIBCURL_FEATURE_ASYNCHDNS 1
-
-/* Defined if libcurl supports IDN */
-#define LIBCURL_FEATURE_IDN 1
-
-/* Defined if libcurl supports IPv6 */
-#define LIBCURL_FEATURE_IPV6 1
-
-/* Defined if libcurl supports KRB4 */
-/* #undef LIBCURL_FEATURE_KRB4 */
-
-/* Defined if libcurl supports libz */
-#define LIBCURL_FEATURE_LIBZ 1
-
-/* Defined if libcurl supports NTLM */
-#define LIBCURL_FEATURE_NTLM 1
-
-/* Defined if libcurl supports SSL */
-#define LIBCURL_FEATURE_SSL 1
-
-/* Defined if libcurl supports SSPI */
-/* #undef LIBCURL_FEATURE_SSPI */
-
-/* Defined if libcurl supports DICT */
-#define LIBCURL_PROTOCOL_DICT 1
-
-/* Defined if libcurl supports FILE */
-#define LIBCURL_PROTOCOL_FILE 1
-
-/* Defined if libcurl supports FTP */
-#define LIBCURL_PROTOCOL_FTP 1
-
-/* Defined if libcurl supports FTPS */
-#define LIBCURL_PROTOCOL_FTPS 1
-
-/* Defined if libcurl supports HTTP */
-#define LIBCURL_PROTOCOL_HTTP 1
-
-/* Defined if libcurl supports HTTPS */
-#define LIBCURL_PROTOCOL_HTTPS 1
-
-/* Defined if libcurl supports IMAP */
-#define LIBCURL_PROTOCOL_IMAP 1
-
-/* Defined if libcurl supports LDAP */
-#define LIBCURL_PROTOCOL_LDAP 1
-
-/* Defined if libcurl supports POP3 */
-#define LIBCURL_PROTOCOL_POP3 1
-
-/* Defined if libcurl supports RTSP */
-#define LIBCURL_PROTOCOL_RTSP 1
-
-/* Defined if libcurl supports SMTP */
-#define LIBCURL_PROTOCOL_SMTP 1
-
-/* Defined if libcurl supports TELNET */
-#define LIBCURL_PROTOCOL_TELNET 1
-
-/* Defined if libcurl supports TFTP */
-#define LIBCURL_PROTOCOL_TFTP 1
-
-/* Defined if libgnurl supports AsynchDNS */
-#define LIBGNURL_FEATURE_ASYNCHDNS 1
-
-/* Defined if libgnurl supports IDN */
-#define LIBGNURL_FEATURE_IDN 1
-
-/* Defined if libgnurl supports IPv6 */
-#define LIBGNURL_FEATURE_IPV6 1
-
-/* Defined if libgnurl supports KRB4 */
-/* #undef LIBGNURL_FEATURE_KRB4 */
-
-/* Defined if libgnurl supports libz */
-#define LIBGNURL_FEATURE_LIBZ 1
-
-/* Defined if libgnurl supports NTLM */
-#define LIBGNURL_FEATURE_NTLM 1
-
-/* Defined if libgnurl supports SSL */
-#define LIBGNURL_FEATURE_SSL 1
-
-/* Defined if libgnurl supports SSPI */
-/* #undef LIBGNURL_FEATURE_SSPI */
-
-/* Defined if libgnurl supports DICT */
-/* #undef LIBGNURL_PROTOCOL_DICT */
-
-/* Defined if libgnurl supports FILE */
-/* #undef LIBGNURL_PROTOCOL_FILE */
-
-/* Defined if libgnurl supports FTP */
-/* #undef LIBGNURL_PROTOCOL_FTP */
-
-/* Defined if libgnurl supports FTPS */
-/* #undef LIBGNURL_PROTOCOL_FTPS */
-
-/* Defined if libgnurl supports HTTP */
-#define LIBGNURL_PROTOCOL_HTTP 1
-
-/* Defined if libgnurl supports HTTPS */
-#define LIBGNURL_PROTOCOL_HTTPS 1
-
-/* Defined if libgnurl supports IMAP */
-/* #undef LIBGNURL_PROTOCOL_IMAP */
-
-/* Defined if libgnurl supports LDAP */
-/* #undef LIBGNURL_PROTOCOL_LDAP */
-
-/* Defined if libgnurl supports POP3 */
-/* #undef LIBGNURL_PROTOCOL_POP3 */
-
-/* Defined if libgnurl supports RTSP */
-/* #undef LIBGNURL_PROTOCOL_RTSP */
-
-/* Defined if libgnurl supports SMTP */
-/* #undef LIBGNURL_PROTOCOL_SMTP */
-
-/* Defined if libgnurl supports TELNET */
-/* #undef LIBGNURL_PROTOCOL_TELNET */
-
-/* Defined if libgnurl supports TFTP */
-/* #undef LIBGNURL_PROTOCOL_TFTP */
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* minimum version of libgcrypt required */
-#define NEED_LIBGCRYPT_VERSION "1.6.1"
-
-/* Name of package */
-#define PACKAGE "anastasis"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "address@hidden"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "anastasis"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "anastasis 0.5.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "anastasis"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.5.0"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* VCS revision/hash or tarball version */
-#define VCS_VERSION "git-7376ecc"
-
-/* Version number of package */
-#define VERSION "0.5.0"
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT64_T */
-
-/* Define curl_free() as free() if our version of curl lacks curl_free. */
-/* #undef curl_free */
-
-/* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do
-   not define. */
-/* #undef intmax_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint16_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint64_t */
-
-/* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
-   do not define. */
-/* #undef uintmax_t */

-- 
To stop receiving notification emails like this one, please contact
address@hidden.