diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-16 16:01:30 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-16 17:01:03 -0800 |
| commit | 684958144817a724b41db9637486b9ced853c020 (patch) | |
| tree | 91e04d5af8422ddc923fb42d4db2a9f6eebb79aa /lib/flowplayer.js | |
| parent | e22c2e64ba9ba18706083710de7b15401fc4c9da (diff) | |
Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
Diffstat (limited to 'lib/flowplayer.js')
0 files changed, 0 insertions, 0 deletions