From 6f1dea665f8e9c1c7ae0bcd2f31fa84ee67fbb1f Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Mar 23 2017 01:47:36 +0000 Subject: Clean up merge mess in sources --- diff --git a/sources b/sources index c60b2b5..2ecdb91 100644 --- a/sources +++ b/sources @@ -1,7 +1,2 @@ -<<<<<<< HEAD -SHA512 (openvpn-2.4.0.tar.gz) = 4996a52cb912f2ad60a90f32420541f0636c03cc250c2c6687dc5594fe77d6629dc59c13dd2c52e09c9ff4eb39c6afbbb381204b6b5a7c8b27ac3c8b711dd2ad -SHA512 (openvpn-2.4.0.tar.gz.asc) = c2d0dea6ce061717eb89d8d55cde839f8618822f0fb400c308b1207c6492905520c0b9a891bd1ccf2911f29cdea58c789eb7a9e194ad784053a1f0cc595e4409 -======= SHA512 (openvpn-2.4.1.tar.xz) = d31ea5740c5aa1083c5f50b344fca0824210ca18ca77f22e08fd1b7866926aa61723545df9a34c12ca81b929efbeb20c43f11b17e1bfeb56c7bfcef67aae82d3 SHA512 (openvpn-2.4.1.tar.xz.asc) = e9d646d135ea0b137dee05c181b9e89f3904b2c4fddeacf849f5aac1b76ba169fd930b17c130e9ce4e172c4beb7d626d9e086d970d5457e6b62662e49df00151 ->>>>>>> master