Removed no longer valid spec.

CocoaPods · Jan 12, 2015 · 1fd9cbb · 1fd9cbb
1 parent 12d8ff6
commit 1fd9cbb
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/lib/xcodeproj/project.rb b/lib/xcodeproj/project.rb
@@ -155,18 +155,6 @@ def to_s
 
     alias_method :inspect, :to_s
 
-<<<<<<< HEAD
-    # @return [Boolean] Whether the `xcproj` conversion should be disabled. The
-    #         conversion can also be disabled via the `XCODEPROJ_DISABLE_XCPROJ`
-    #         environment variable.
-    #
-    attr_accessor :disable_xcproj
-    def disable_xcproj?
-      @disable_xcproj || ENV['XCODEPROJ_DISABLE_XCPROJ']
-    end
-
-=======
->>>>>>> 74e6190... Directly write ASCII plists using DevToolsCore.
     public
 
     # @!group Initialization