summaryrefslogtreecommitdiff
path: root/npc/events/valentinesday.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-09-16 08:12:48 -0300
committershennetsind <ind@henn.et>2013-09-16 08:12:48 -0300
commit5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7 (patch)
treeda13821a29480d88dcd872c682b26b75e5191482 /npc/events/valentinesday.txt
parent4eb223b62e70a293dd2c95f1ce8b29a3f0c83ef7 (diff)
parentfe2f840e5d6cb4230ba02c47132790d067b3814d (diff)
downloadhercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.gz
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.bz2
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.tar.xz
hercules-5d33b1cc58d3c831f5fb9f7f368aa996d4be82c7.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Solved minor conflicts that were caused by the unit interface Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/events/valentinesday.txt')
-rw-r--r--npc/events/valentinesday.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index 8f2bd85d5..a08a1a701 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -126,4 +126,4 @@ prt_castle,54,34,4 script Carl Orleans 47,{
mes "[Carl Orleans]";
mes "Enjoy.";
close;
-} \ No newline at end of file
+}