Skip to content

Commit 676fb75

Browse files
committed
Merge branch 'main' into v20
2 parents e9ec172 + c73c6a0 commit 676fb75

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ Enjoy!
9494
## Demo <a name="demo"></a>
9595

9696
<p align="center">
97+
<<<<<<< HEAD
9798
<img src="https://raw.githubusercontent.com/ProAngular/ngx-gist/refs/heads/main/public/images/demo-gist.gif" />
99+
=======
100+
<img src="public/images/demo-gist.gif" />
101+
>>>>>>> main
98102
</p>
99103
100104
Live demo here:

0 commit comments

Comments
 (0)