From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 22 Feb 2016 04:06:33 +0000 (+1100)
Subject: Fix merge conflicts in network-stream-tests.el
X-Git-Tag: emacs-26.0.90~2520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f577f59a5216bc7708bb840f5eac3e82950e81e8;p=emacs.git

Fix merge conflicts in network-stream-tests.el
---

f577f59a5216bc7708bb840f5eac3e82950e81e8
diff --cc test/lisp/net/network-stream-tests.el
index a5e146f02c8,e19bd528961..c6a20b09690
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@@ -204,8 -230,7 +237,8 @@@
  (ert-deftest connect-to-tls-ipv6-nowait ()
    (skip-unless (executable-find "gnutls-serv"))
    (skip-unless (gnutls-available-p))
 +  (skip-unless (not (eq system-type 'windows-nt)))
-   (let ((server (make-tls-server))
+   (let ((server (make-tls-server 44333))
          (times 0)
          proc status)
      (sleep-for 1)