diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2017-04-26 13:09:12 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2017-04-26 13:09:12 +0000 |
| commit | 899c7d50ee79b872797feea3e418034f95a36d11 (patch) | |
| tree | 381daafa7dd656316610e3961c90d6d2c56af9d9 /external/mit/lua/dist/src/lua.h | |
| parent | 034e5ddb0c1e167fec5bce47ef3e7b6edd725f45 (diff) | |
import conflict resolution
Diffstat (limited to 'external/mit/lua/dist/src/lua.h')
| -rw-r--r-- | external/mit/lua/dist/src/lua.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/mit/lua/dist/src/lua.h b/external/mit/lua/dist/src/lua.h index 564178437ca..58958426739 100644 --- a/external/mit/lua/dist/src/lua.h +++ b/external/mit/lua/dist/src/lua.h @@ -1,4 +1,4 @@ -/* $NetBSD: lua.h,v 1.8 2017/04/26 12:49:34 mbalmer Exp $ */ +/* $NetBSD: lua.h,v 1.9 2017/04/26 13:17:33 mbalmer Exp $ */ /* ** Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp @@ -38,7 +38,6 @@ " Copyright (c) 2016-2016, Lourival Vieira Neto <lneto@NetBSD.org>." \ " Copyright (C) 1994-2017 Lua.org, PUC-Rio" #endif /* _KERNEL */ ->>>>>>> 1.1.1.11 #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" |
