xarxaprod
/
oficinasuport-wp-theme
3
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

merged with main, coflict resolved

This commit is contained in:
jorge 2023-01-07 13:49:34 +01:00
parent dbfcf0b3fe
commit bb3de98e62
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -25,13 +25,7 @@ node_modules/
# ignore local personal files # ignore local personal files
*.geany *.geany
<<<<<<< HEAD
.vscode/ .vscode/
.DS_Store .DS_Store
theme/ theme/
_gitignore* _gitignore*
=======
.DS_Store
theme/
>>>>>>> main