Fixes on Vehicle Assignment & Vehicle Release Order

Not really sure why 'cant automatically merge', received these warning when commit..
-----------------------
CQ36-110TX@NURHASHIMAH ~/txport (fix-vehicle-assignment-vro)
$ git commit -m "Fixes on Vehicle Assignment & Vehicle Release Order"
[fix-vehicle-assignment-vro warning: LF will be replaced by CRLF in db/migrate/2
0140324032343_fix_columns_to_vehicle_assignments.rb.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in db/migrate/20140324033057_add_columns_to
_vehicle_assignment_details.rb.
The file will have its original line endings in your working directory.
5d5e8ae] Fixes on Vehicle Assignment & Vehicle Release Order
warning: LF will be replaced by CRLF in db/migrate/20140324032343_fix_columns_to
_vehicle_assignments.rb.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in db/migrate/20140324033057_add_columns_to
_vehicle_assignment_details.rb.
The file will have its original line endings in your working directory.
 14 files changed, 119 insertions(+), 47 deletions(-)
 create mode 100644 db/migrate/20140324032343_fix_columns_to_vehicle_assignments
.rb
 create mode 100644 db/migrate/20140324033057_add_columns_to_vehicle_assignment_
details.rb
--------------------------------