From d7b4f7d023bad2444a2b39f45b958a13aab4161a Mon Sep 17 00:00:00 2001
From: Dima Pasechnik <dimpase@gmail.com>
Date: Thu, 8 Feb 2018 12:50:08 +0000
Subject: [PATCH] correct merge

---
 gmp-h.in | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gmp-h.in b/gmp-h.in
index c111ab52..307893ce 100644
--- a/gmp-h.in
+++ b/gmp-h.in
@@ -28,20 +28,11 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include <stdarg.h>   /* on Sun Studio */
 #endif 
 
-<<<<<<< HEAD
 #if defined(__has_include)  /* should work on gcc 5.x or better, clang, VS 2015+ */
-=======
-#if defined(sun) || defined(__sun)
-#if defined(__has_include)  /* should work on gcc 5.x or better, or on clang */
->>>>>>> 67e6c2fb68ce0419d7974de384ccc70def6ac8ba
-#if __has_include(<stdint.h>)
-#include <stdint.h>
+# if __has_include(<stdint.h>)
+#  include <stdint.h>
+# endif
 #endif
-#endif
-<<<<<<< HEAD
-=======
-#endif
->>>>>>> 67e6c2fb68ce0419d7974de384ccc70def6ac8ba
 
 #if defined (__cplusplus)