Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Loretta 2024-11-11 13:50:53 +01:00
parent d834e6057e 8aa36ead54
commit 0cfd6f211f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -159,6 +159,7 @@ Desktop.ini
$RECYCLE.BIN/ $RECYCLE.BIN/
# Mac crap # Mac crap
<<<<<<< HEAD
.DS_Store .DS_Store
obj obj
obj obj
@ -166,3 +167,6 @@ obj
obj obj
obj obj
obj obj
=======
.DS_Store
>>>>>>> 8aa36ead54fe1e3643e0e82c13af748d0672792b