From 68edd00d9258df93b1366c71ac124e0cadf7bc08 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:39:33 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/perlasm/x86asm.pl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/libcrypto/perlasm/x86asm.pl')

diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
index 7c675e3ced..60233f80e8 100644
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ b/src/lib/libcrypto/perlasm/x86asm.pl
@@ -130,4 +130,6 @@ BSDI - a.out with a very primative version of as.
 EOF
 	}
 
+sub main'align() {} # swallow align statements in 0.9.7 context
+
 1;
-- 
cgit v1.2.3-55-g6feb