aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2006-07-13 04:01:38 +0800
committeritetcu <itetcu@FreeBSD.org>2006-07-13 04:01:38 +0800
commit42ce5873651da2c1f9e84a6a106d331e99dd329b (patch)
tree4060b8e9b3e29c632d83a29e4743c1159ec785ae /graphics
parentb606ddbc6ba8d23a61a94e0097684cf26a2c8069 (diff)
downloadfreebsd-ports-gnome-42ce5873651da2c1f9e84a6a106d331e99dd329b.tar.gz
freebsd-ports-gnome-42ce5873651da2c1f9e84a6a106d331e99dd329b.tar.zst
freebsd-ports-gnome-42ce5873651da2c1f9e84a6a106d331e99dd329b.zip
Really fix breakage from aborted commit.
Submitted by: maintainer
Diffstat (limited to 'graphics')
-rw-r--r--graphics/jdraw/files/jdraw.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index 0d8d0510137a..d2de0aa702cf 100644
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@@ -1,13 +1,13 @@
#!/bin/sh
# $FreeBSD$
+
if [ -z "${JAVA_VERSION}" ]; then
JAVA_VERSION="%%JAVA_VERSION%%"
fi
if [ "${JAVA_VERSION}" \> "1.4" ]; then
->>>>>>> 1.2
- LOOK_AND_FEEL="%%PLASTIC3D%%"
-else
+ LOOK_AND_FEEL="%%PLASTIC3D%%"
+ else
LOOK_AND_FEEL=
fi