Fix merge conflict

DeadPackets · Jun 22, 2021 · 12c91fd · 12c91fd
2 parents 97d7cb5 + dcecf64
commit 12c91fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-v2.3.2
+v2.4.7
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -5,6 +5,7 @@ cp -a /etc/skel/. /root/
 echo 'export PATH=$PATH:/root/.local/bin:/usr/share/doc/python3-impacket/examples/' >> /root/.zshrc
 echo 'export LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8' >> /root/.zshrc
 echo "export DISPLAY=$DISPLAY" >> /root/.zshrc
+echo "export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true'" >> /root/.zshrc
 touch /root/.hushlogin
 cp /setup/banner.sh /etc/profile.d/banner.sh
 
@@ -42,4 +43,4 @@ fi
 
 # Launch ssh
 echo "Launching SSH..."
-/usr/sbin/sshd -D -e
+/usr/sbin/sshd -D -e