resolve merge conflicts with remote

update content
2026-03-31 11:54:30 +02:00 · 2026-03-31 11:45:07 +02:00
3 changed files with 7 additions and 1 deletions
--- a/config_files/.zshrc
+++ b/config_files/.zshrc
@@ -215,3 +215,6 @@ export EDITOR="code --wait"
 export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
 export PATH=$JAVA_HOME/bin:$PATH
 # to print the date for the history command
 setopt EXTENDED_HISTORY
--- a/tutos/computer.txt
+++ b/tutos/computer.txt
@@ -320,6 +320,6 @@ find | sort | grep -ve "node_modules/" -e ".git/" | sed 's#[^/]*/#|__ #g;s#__ |#
 		- the old default shortcut executed this command : **xfce4-screenshooter -f**
 		- now it executes a script that will make the capture instantanously
 		- this script contains this command : **xfce4-screenshooter -f -s /home/asususus/Nextcloud/medias/screenshots/screenshot-$(date +%Y-%m-%d_%H-%M-%S).png**
-			- the script is located in ~/.local/bin
+			- the script is located in ~/.local/bin/screenshot.sh
 		- i also added a shortcut to execute the previous command : **ctrl print**
--- a/tutos/server.md
+++ b/tutos/server.md
@@ -140,6 +140,9 @@ todo list :
 ---
 install pbs on a vm on proxmox (Proxmox Backup Server) -> to have incremental backups
 ---
 when i connect to proxmox i get this message : You do not have a valid subscription for this server. Please visit www.proxmox.com to get a list of available options.
 ChatGPT said:
Author	SHA1	Message	Date
Hugo LAMY	480cfb0dc7	resolve merge conflicts with remote	2026-03-31 11:54:30 +02:00
Hugo LAMY	7644778ecf	update content	2026-03-31 11:45:07 +02:00