diff options
| author | Jeff Geerling <geerlingguy@mac.com> | 2016-03-03 22:49:30 -0600 |
|---|---|---|
| committer | Jeff Geerling <geerlingguy@mac.com> | 2016-03-03 22:49:30 -0600 |
| commit | 836d4144c3090636fa74bedd55842ba19bc7c1dc (patch) | |
| tree | 103fd05671d52dfab54cb7c38d08a747bff057c6 /.travis.yml | |
| parent | 8997ed53da3dcfcb875e1eec6e38205394b04e3e (diff) | |
| parent | 9c0a3ce4ff0c8bc00dbb8497193c2fc5f015c5aa (diff) | |
| download | ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.gz ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.bz2 ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.xz ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.zip | |
Fixed merge conflicts.
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions