From 494c76b42f31b6fe9d3f6e8660b2024d7beb4cd9 Mon Sep 17 00:00:00 2001
From: Chris Pham <phamchr@onid.orst.edu>
Date: Thu, 18 Jan 2018 10:58:24 -0800
Subject: [PATCH] fixed fp naming conventions

---
 ground_station/resources/core/mapping.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ground_station/resources/core/mapping.py b/ground_station/resources/core/mapping.py
index 8a9531d..a88ff67 100644
--- a/ground_station/resources/core/mapping.py
+++ b/ground_station/resources/core/mapping.py
@@ -12,9 +12,15 @@ import time
 #####################################
 # Constants
 #####################################
+<<<<<<< 666f522bf5947794d802e8cbbf221ac004fc4eed
 fp = open('key', w)
 _KEY = fp.read().rstrip()
 fp.close()
+=======
+file_pointer = open('key', 'w')
+_KEY = file_pointer.read().rstrip()
+file_pointer.close()
+>>>>>>> fixed fp naming conventions
 
 # Number of pixels in half the earth's circumference at zoom = 21
 _EARTHPIX = 268435456