remove git tags

Zimbra-Community · Mar 27, 2016 · f5c5199 · f5c5199
1 parent bac9896
commit f5c5199
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -35,11 +35,7 @@ The recommended method is to deploy using git. (I no longer support zmzimletctl,
     [root@myzimbra ~]# rm pgp-zimlet -Rf
     [root@myzimbra ~]# git clone https://github.com/Zimbra-Community/pgp-zimlet
     [root@myzimbra ~]# cd pgp-zimlet
-<<<<<<< HEAD
     [root@myzimbra pgp-zimlet]# git checkout 2.0.7
-=======
-    [root@myzimbra pgp-zimlet]# git checkout 2.0.6
->>>>>>> stable
     [root@myzimbra pgp-zimlet]# chmod +rx install-dev.sh
     [root@myzimbra pgp-zimlet]# ./install-dev.sh
     [root@myzimbra pgp-zimlet]# su zimbra

diff --git a/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml b/tk_barrydegraaff_zimbra_openpgp/tk_barrydegraaff_zimbra_openpgp.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <zimlet name="tk_barrydegraaff_zimbra_openpgp" version="2.0.7" label="OpenPGP" description="Encrypt/Decrypt messages with OpenPGP">
-=======
-<zimlet name="tk_barrydegraaff_zimbra_openpgp" version="2.0.6" label="OpenPGP" description="Encrypt/Decrypt messages with OpenPGP">
->>>>>>> stable
    <summary>
 Zimbra OpenPGP Zimlet