Resolved Conflicts

[proxmark3-svn] / client / scripts / didump.lua

diff --git a/client/scripts/didump.lua b/client/scripts/didump.lua
index 124c3dc3774c5a02d577833abb161a42d7deea44..71bfd99c6ef3d4bffb6f5360dda95a4534e893b5 100644 (file)
--- a/client/scripts/didump.lua
+++ b/client/scripts/didump.lua
@@ -406,7 +406,7 @@ function main(args)
 
        -- GET TAG UID
        
-       result, err = lib14a.read1443a(false, true)
+       result, err = lib14a.read14443a(false, true)
        if not result then
                return oops(err)
        end