Skip to content

Commit 7897322

Browse files
author
koca2000
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
2 parents 47f0ff9 + 51cefa0 commit 7897322

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
<<<<<<< HEAD
12
NoteBlockAPI
23
============
34

45
See http://dev.bukkit.org/bukkit-plugins/noteblockapi/ for more info about NoteBlockAPI
56

67
See "LICENSE" for license :)
8+
=======
9+
# NoteBlockAPI
10+
[![](https://jitpack.io/v/koca2000/NoteBlockAPI.svg)](https://jitpack.io/#koca2000/NoteBlockAPI)
11+
12+
For informations about this Spigot/Bukkit API go to https://www.spigotmc.org/resources/noteblockapi.19287/
13+
>>>>>>> origin/master

0 commit comments

Comments
 (0)