Skip to content

Commit 8bd0a1a

Browse files
committed
Merge branch 'main' of https://github.com/Synt4xErr0r4/json5.git into
main Conflicts: README.md
2 parents 1aff85d + f66f861 commit 8bd0a1a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ This is a reference implementation, capable of parsing JSON5 data according to t
1212

1313
## Getting started
1414

15-
<<<<<<< HEAD
1615
In order to use the code, you can either [download the jar](https://github.com/Synt4xErr0r4/json5/releases/download/1.1.0/json5-1.1.0.jar), or use the Maven dependency:
17-
=======
18-
In order to use the code, you can either [download the jar](https://github.com/Synt4xErr0r4/json5/releases/download/1.0.0/json5-1.0.0.jar), or use the Maven dependency:
19-
>>>>>>> branch 'main' of https://github.com/Synt4xErr0r4/json5.git
2016
```xml
2117
<!-- Repository -->
2218

0 commit comments

Comments
 (0)