From 3362020a6bc43766a92882abe6d127c8bb98a628 Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Mon, 15 Feb 2016 15:04:13 +0800
Subject: try a basic merge

---
 nerv/lib/common.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nerv/lib/common.c')

diff --git a/nerv/lib/common.c b/nerv/lib/common.c
index db667b2..d977f8d 100644
--- a/nerv/lib/common.c
+++ b/nerv/lib/common.c
@@ -41,6 +41,7 @@ int nerv_error_status(lua_State *L, Status *status) {
                                         status->file, status->lineno);
     else
         nerv_error(L, "%s @%s:%d", mmesg, status->file, status->lineno);
+    return 0;
 }
 
 int nerv_error_method_not_implemented(lua_State *L) {
-- 
cgit v1.2.3