aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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