fix merge screwup

pandas/core/arrays/datetimelike.py

@@ -17,7 +17,10 @@ class DatetimeLikeArrayMixin(object):
 
     Assumes that __new__/__init__ defines:
         _data
-        freq
+        _freq
+
+    and that the inheriting class has methods:
+        _validate_frequency
     """
 
     @property
@@ -79,6 +82,20 @@ def _maybe_mask_results(self, result, fill_value=None, convert=None):
         return result
 
     # ------------------------------------------------------------------
+    # Frequency Properties/Methods
+
+    @property
+    def freq(self):
+        """Return the frequency object if it is set, otherwise None"""
+        return self._freq
+
+    @freq.setter
+    def freq(self, value):
+        if value is not None:
+            value = frequencies.to_offset(value)
+            self._validate_frequency(self, value)
+
+        self._freq = value
 
     @property
     def freqstr(self):

pandas/core/arrays/datetimes.py

@@ -47,16 +47,6 @@ def _timezone(self):
         """ Comparable timezone both for pytz / dateutil"""
         return timezones.get_timezone(self.tzinfo)
 
-    @property
-    def freq(self):
-        """get/set the frequency of the instance"""
-        return self._freq
-
-    @freq.setter
-    def freq(self, value):
-        """get/set the frequency of the instance"""
-        self._freq = value
-
     @property
     def offset(self):
         """get/set the frequency of the instance"""

pandas/core/indexes/datetimelike.py

@@ -228,19 +228,6 @@ def _validate_frequency(cls, index, freq, **kwargs):
                    'conform to passed frequency {passed}')
             raise ValueError(msg.format(infer=inferred, passed=freq.freqstr))
 
-    @property
-    def freq(self):
-        """Return the frequency object if it is set, otherwise None"""
-        return self._freq
-
-    @freq.setter
-    def freq(self, value):
-        if value is not None:
-            value = frequencies.to_offset(value)
-            self._validate_frequency(self, value)
-
-        self._freq = value
-
 
 class DatetimeIndexOpsMixin(DatetimeLikeArrayMixin):
     """ common ops mixin to support a unified interface datetimelike Index """