From 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sat, 6 Sep 2008 12:17:47 +0000
Subject: resolve conflicts

---
 lib/libssl/src/crypto/ui/ui_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/libssl/src/crypto/ui/ui_util.c')

diff --git a/lib/libssl/src/crypto/ui/ui_util.c b/lib/libssl/src/crypto/ui/ui_util.c
index 46bc8c1a9a0..5d9760bb7b3 100644
--- a/lib/libssl/src/crypto/ui/ui_util.c
+++ b/lib/libssl/src/crypto/ui/ui_util.c
@@ -54,7 +54,7 @@
  */
 
 #include <string.h>
-#include <openssl/ui.h>
+#include "ui_locl.h"
 
 int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
 	{
-- 
cgit v1.2.3-59-g8ed1b