Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Web/static/Img/BG.png
#	index.html
#	main.css
#	main.css.map
#	main.sass
  • Loading branch information
MatejMa2ur committed Nov 30, 2023
2 parents d5911af + 3fa4647 commit 208017b
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .vscode/sftp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "My Server",
"host": "localhost",
"protocol": "sftp",
"port": 22,
"username": "username",
"remotePath": "/",
"uploadOnSave": false,
"useTempFile": false,
"openSsh": false
}

0 comments on commit 208017b

Please sign in to comment.