From 6743a41b266ea0387d901b6da846eb5032893c66 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:37:56 -0500
Subject: [PATCH] Fix merge conflict,

---
 moto/ec2/models.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index edd56f89..8fdb7444 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -299,11 +299,8 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
-<<<<<<< HEAD
         self.launch_time = datetime.now().isoformat()
-=======
         self.private_ip_address = kwargs.get('private_ip_address')
->>>>>>> c22ea3014b8d2068696ef246e90bd9ec8ec90b91
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())