fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
# Windows
[Dd]esktop.ini
Thumbs.db
$RECYCLE.BIN/
.idea/
 
# macOS
.DS_Store
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
 
# Node.js
node_modules/