--- a/components/conflict/Makefile	Fri Mar 04 13:37:19 2016 -0800
+++ b/components/conflict/Makefile	Fri Mar 04 13:38:39 2016 -0800
@@ -20,24 +20,24 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 BITS=64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		conflict
-COMPONENT_VERSION=	20140723
-IPS_COMPONENT_VERSION=	0.2014.7.23
+COMPONENT_VERSION=	20150705
+IPS_COMPONENT_VERSION=	0.2015.7.5
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_PROJECT_URL=	http://invisible-island.net/conflict/conflict.html
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2ef48ef4c3e2b26eb2de7748ff07e296de3ab7a4437540d60e1fdf321fc5c943
+    sha256:30e14808768a938df139a1b76f8f7397e1b3bf46a18ceabcc8b1b1a70d5ea8a9
 COMPONENT_ARCHIVE_URL=	ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/conflict
 
-TPNO=			21547
+TPNO=			27130
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk

--- a/components/conflict/conflict.copyright	Fri Mar 04 13:37:19 2016 -0800
+++ b/components/conflict/conflict.copyright	Fri Mar 04 13:38:39 2016 -0800
@@ -1,4 +1,4 @@
-Copyright 1995-2013,2014 by Thomas E. Dickey
+Copyright 1995-2014,2015 by Thomas E. Dickey
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,