broken config.sub with a ton unresolved merge conflicts

google / farmhash

Automatically exported from code.google.com/p/farmhash

MIT License

626 stars 99 forks source link

broken config.sub with a ton unresolved merge conflicts #9

Closed paszea closed 8 years ago

paszea commented 8 years ago

https://github.com/google/farmhash/blob/master/config.sub

e.g.

#! /bin/sh
# Configuration validation subroutine script.
<<<<<<< HEAD
#   Copyright 1992-2016 Free Software Foundation, Inc.

timestamp='2016-06-20'
=======
#   Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2015-08-20'
>>>>>>> 96e46782298bdf50ac214ab1920e4eb49f7a0cda

geoffpike commented 8 years ago

Thank you for pointing this out. It is fixed now.