diff --git a/src/modules/bitrate_controller/bitrate_controller.gypi b/src/modules/bitrate_controller/bitrate_controller.gypi
index 54b45e417..4f19cb525 100644
--- a/src/modules/bitrate_controller/bitrate_controller.gypi
+++ b/src/modules/bitrate_controller/bitrate_controller.gypi
@@ -1,123 +1,61 @@
-# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'bitrate_controller',
-      'type': '<(library)',
-      'dependencies': [
-        '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-      ],
-      'include_dirs': [
-        '../interface',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../interface',
-          '<(webrtc_root)/modules/rtp_rtcp/interface',
-        ],
-      },
-      'sources': [
-        'bitrate_controller_impl.cc',
-        'bitrate_controller_impl.h',
-        'include/bitrate_controller.h',
-        'send_side_bandwidth_estimation.cc',
-        'send_side_bandwidth_estimation.h',
-      ],
-    },
-  ], # targets
-
-  'conditions': [
-    ['include_tests==1', {
-      'targets' : [
-        {
-          'target_name': 'bitrate_controller_unittests',
-          'type': 'executable',
-          'dependencies': [
-            'bitrate_controller',
-            '<(webrtc_root)/../test/test.gyp:test_support_main',
-            '<(webrtc_root)/../testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'bitrate_controller_unittest.cc',
-           ],
-         },
-       ], # targets
-    }], # include_tests
-  ], # conditions
-
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
-=======
-# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'bitrate_controller',
-      'type': '<(library)',
-      'dependencies': [
-        '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-      ],
-      'include_dirs': [
-        '../interface',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../interface',
-          '<(webrtc_root)/modules/rtp_rtcp/interface',
-        ],
-      },
-      'sources': [
-        'bitrate_controller_impl.cc',
-        'bitrate_controller_impl.h',
-        'include/bitrate_controller.h',
-        'send_side_bandwidth_estimation.cc',
-        'send_side_bandwidth_estimation.h',
-      ],
-    },
-  ], # targets
-
-  'conditions': [
-    ['include_tests==1', {
-      'targets' : [
-        {
-          'target_name': 'bitrate_controller_unittests',
-          'type': 'executable',
-          'dependencies': [
-            'bitrate_controller',
-            '<(webrtc_root)/../test/test.gyp:test_support_main',
-            '<(webrtc_root)/../testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'bitrate_controller_unittest.cc',
-           ],
-         },
-       ], # targets
-    }], # include_tests
-  ], # conditions
-
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'targets': [
+    {
+      'target_name': 'bitrate_controller',
+      'type': '<(library)',
+      'dependencies': [
+        '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+      ],
+      'include_dirs': [
+        '../interface',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../interface',
+          '<(webrtc_root)/modules/rtp_rtcp/interface',
+        ],
+      },
+      'sources': [
+        'bitrate_controller_impl.cc',
+        'bitrate_controller_impl.h',
+        'include/bitrate_controller.h',
+        'send_side_bandwidth_estimation.cc',
+        'send_side_bandwidth_estimation.h',
+      ],
+    },
+  ], # targets
+
+  'conditions': [
+    ['include_tests==1', {
+      'targets' : [
+        {
+          'target_name': 'bitrate_controller_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'bitrate_controller',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'bitrate_controller_unittest.cc',
+           ],
+         },
+       ], # targets
+    }], # include_tests
+  ], # conditions
+
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2