old_contents: """
    Copyright 2014 Google Inc. All rights reserved.
  
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  """
  
  import webapp2
  import os, sys
  
  
  class BrowserRedirector(webapp2.RequestHandler):
  
  <<<<<<< HEAD
      def get(self):
        ua = self.request.headers.get('User-Agent')
        if not 'Chrome/' in ua:
          self.response.headers['Content-Type'] = 'text/plain'
          self.response.out.write('browser redirector under development, try back later')
          return
  
        self.redirect('/chrome/sample_timing.html')
  
  =======
    def get(self):
      ua = self.request.headers.get('User-Agent')
      self.response.headers['Content-Type'] = 'text/plain'
      self.response.out.write(
          'browser redirector under development, try back later')
  >>>>>>> ahmet-celik-master
  
  
  app = webapp2.WSGIApplication([
      ('/', BrowserRedirector),
  ], debug=True)
  
new_contents: """
    Copyright 2014 Google Inc. All rights reserved.
  
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
  
        http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  """
  
  import webapp2
  import os, sys
  
  
  class BrowserRedirector(webapp2.RequestHandler):
  
    def get(self):
      ua = self.request.headers.get('User-Agent')
      if not 'Chrome/' in ua:
        self.response.headers['Content-Type'] = 'text/plain'
        self.response.out.write('browser redirector under development, try back later')
        return
  
      self.redirect('/chrome/sample_timing.html')
  
  
  app = webapp2.WSGIApplication([
      ('/', BrowserRedirector),
  ], debug=True)
  
subject: fix merge conflicts