From dc8cacdafb4c508e71c89d8a364db2a7c3801c15 Mon Sep 17 00:00:00 2001 From: lbriggs Date: Sun, 12 Apr 2015 22:18:03 +0100 Subject: [PATCH] Cleanup --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 4fabb9d..4edf784 100644 --- a/README.md +++ b/README.md @@ -549,11 +549,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks. * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple. * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration. -<<<<<<< HEAD * [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer. -======= * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution. ->>>>>>> 55b7e6c4e3269a6c8e199d77a41c778696f972b6 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments. * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation. * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.