From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qt1Ud-0003oq-2Q for garchives@archives.gentoo.org; Mon, 15 Aug 2011 18:02:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A424A21C0EE; Mon, 15 Aug 2011 18:02:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7724421C0EE for ; Mon, 15 Aug 2011 18:02:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E18011B4017 for ; Mon, 15 Aug 2011 18:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 29A5780040 for ; Mon, 15 Aug 2011 18:02:22 +0000 (UTC) From: "Dongxu Li" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dongxu Li" Message-ID: <7fe3d709ced9080192c3eb7d6d9abaeb3ee2e37d.dongxuli@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/acl2/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/acl2/metadata.xml X-VCS-Directories: sci-mathematics/acl2/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: 7fe3d709ced9080192c3eb7d6d9abaeb3ee2e37d Date: Mon, 15 Aug 2011 18:02:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a7ca61d644c5c48d6bfa74acd91df658 commit: 7fe3d709ced9080192c3eb7d6d9abaeb3ee2e37d Author: Dongxu Li gmail com> AuthorDate: Mon Aug 15 18:02:15 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Mon Aug 15 18:02:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D7fe3d709 sci-mathematics/acl2: fixed broken git merge --- sci-mathematics/acl2/metadata.xml | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/met= adata.xml index d7e31bf..42ce6d7 100644 --- a/sci-mathematics/acl2/metadata.xml +++ b/sci-mathematics/acl2/metadata.xml @@ -5,13 +5,7 @@ dongxuli2011@gmail.com Dongxu Li -<<<<<<< HEAD ACL2 industrial strength theorem prover - ACL2 is both a programming language in which you can m= odel computer systems and a tool to help you prove properties of those mo= dels. - -ACL2 is part of the Boyer-Moore family of provers, for which its authors= have received the 2005 ACM Software System Award. -=3D=3D=3D=3D=3D=3D=3D - ->>>>>>> 25472952dde6cf1e1c106c813dce6feb32d1638d + ACL2 is both a programming language in which you can m= odel computer systems and a tool to help you prove properties of those mo= dels. ACL2 is part of the Boyer-Moore family of provers, for which its au= thors have received the 2005 ACM Software System Award.