aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/jdraw/files/jdraw.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index ff618b262676..0d8d0510137a 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=