Removed weird space-looking character

Author: Melissa LeBlanc-Williams

adafruit_featherwing/rtc_featherwing.py

@@ -292,20 +292,12 @@ def unixtime(self):
         try:
             return time.mktime(self._rtc.datetime)
         except (ValueError, RuntimeError) as error:
-<<<<<<< Updated upstream
-            print("There was an error attempting to run time.mktime() on this board")
-=======
             print("Error attempting to run time.mktime() on this board\n", error)
->>>>>>> Stashed changes
 
     @unixtime.setter
     def unixtime(self, unixtime):
         if isinstance(unixtime, int):
             try:
                 self._rtc.datetime = time.localtime(unixtime)
             except (ValueError, RuntimeError) as error:
-<<<<<<< Updated upstream
-                print("There was an error attempting to run time.localtime() on this board")
-=======
                 print("Error attempting to run time.localtime() on this board\n", error)
->>>>>>> Stashed changes