From 75742aefe2b92f484fccbcb3675785ebb3781789 Mon Sep 17 00:00:00 2001
From: itetcu <itetcu@FreeBSD.org>
Date: Tue, 11 Jul 2006 20:25:12 +0000
Subject: Finish previous interrupted commit.  Update to 1.1.5

 PR:             ports/100105
 Submitted by:   maintainer
---
 graphics/jdraw/files/jdraw.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'graphics/jdraw')

diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index ff618b2..0d8d051 100644
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@@ -5,6 +5,7 @@ if [ -z "${JAVA_VERSION}" ]; then
 fi
 
 if [ "${JAVA_VERSION}" \> "1.4" ]; then
+>>>>>>> 1.2
 	LOOK_AND_FEEL="%%PLASTIC3D%%"
 else
 	LOOK_AND_FEEL=
-- 
cgit v1.1