fixing conflicts
This commit is contained in:
commit
7577b18876
|
@ -1,8 +1,11 @@
|
|||
.DS_Store
|
||||
node_modules
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
public/bundle.js
|
||||
=======
|
||||
>>>>>>> add gitignore
|
||||
=======
|
||||
>>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
|
||||
static/*
|
||||
!static/info.txt
|
||||
|
|
|
@ -90,5 +90,4 @@
|
|||
</g>
|
||||
</g>
|
||||
</g>
|
||||
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Loading…
Reference in New Issue