diff options
| author | Bdale Garbee <bdale@gag.com> | 2010-03-30 23:15:32 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2010-03-30 23:15:32 -0600 |
| commit | b41e617080fe825f7810ee5eee52ea37f7618ec6 (patch) | |
| tree | 5ccef7a1ed75625690550cd0b9787da437ee117f /ChangeLog | |
| parent | 28e40ccfcd80ab8764d4aa235257cea4d193a0c1 (diff) | |
| parent | df7bda1f32b0049c3878c325ea0b55999f3980e3 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,3 +1,4 @@ +<<<<<<< HEAD commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8 Author: Bdale Garbee <bdale@gag.com> Date: Tue Mar 30 23:11:40 2010 -0600 @@ -10,6 +11,8 @@ Date: Mon Mar 15 12:04:18 2010 -0600 move gbp.conf into debian/ +======= +>>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3 commit eda5e1166a97766aa22561beaa1086ba4e19ee16 Author: Bdale Garbee <bdale@gag.com> Date: Thu Mar 4 17:33:39 2010 -0700 |