resolve conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/objects/obj_dat.pl b/src/lib/libcrypto/objects/obj_dat.pl
index d0371661f9..8a09a46ee6 100644
--- a/src/lib/libcrypto/objects/obj_dat.pl
+++ b/src/lib/libcrypto/objects/obj_dat.pl
@@ -94,7 +94,7 @@ for ($i=0; $i<$n; $i++)
         {
         if (!defined($nid{$i}))
                 {
-                push(@out,"{NULL,NULL,NID_undef,0,NULL},\n");
+                push(@out,"{NULL,NULL,NID_undef,0,NULL,0},\n");
                 }
         else
                 {
@@ -138,7 +138,7 @@ for ($i=0; $i<$n; $i++)
                         }
                 else
                         {
-                        $out.="0,NULL";
+                        $out.="0,NULL,0";
                         }
                 $out.="},\n";
                 push(@out,$out);