3 files changed, 0 insertions, 51 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index c5904b375e..88bd002a8c 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -2220,7 +2220,6 @@ erl_start(int argc, char **argv)
 	init_break_handler();
     if (replace_intr)
 	erts_replace_intr();
-    sys_init_suspend_handler();
 #endif
 
     boot_argc = argc - i;  /* Number of arguments to init */
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index fa95473db8..e135dbff99 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -819,61 +819,15 @@ void init_break_handler(void)
 }
 
 void sys_init_suspend_handler(void)
-<<<<<<< HEAD
 {
 #ifdef ERTS_SYS_SUSPEND_SIGNAL
    sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
-=======
-{
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
-   sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
-#endif
-}
-
-int sys_max_files(void)
-{
-   return(max_files);
-}
-
-static void block_signals(void)
-{
-#if !CHLDWTHR
-   sys_sigblock(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
-   sys_sigblock(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
-   sys_sigblock(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
-   sys_sigblock(ERTS_SYS_SUSPEND_SIGNAL);
->>>>>>> maint-18
 #endif
 }
 
 int sys_max_files(void)
 {
-<<<<<<< HEAD
    return(max_files);
-=======
-    /* Update erl_child_setup.c if changed */
-#if !CHLDWTHR
-   sys_sigrelease(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
-   sys_sigrelease(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
-   sys_sigrelease(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
-   sys_sigrelease(ERTS_SYS_SUSPEND_SIGNAL);
-#endif
-
->>>>>>> maint-18
 }
 
 /************************** OS info *******************************/
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index f4d1c7b4ba..38e2db9033 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1,5 +1 @@
-<<<<<<< HEAD
 CRYPTO_VSN = 3.7.2
-=======
-CRYPTO_VSN = 3.6.3.1
->>>>>>> maint-18