chore(travis): (fix) custom merge pubspec.lock for g3v1x rebases
chore(travis): (fix) custom merge pubspec.lock for g3v1x rebases

Use the current version and not the ancestor version.  This means that
the merge driver has nothing to do except exist.

trinarytree/angular.dart,giovannicandido/angular.dart,giovannicandido/angular.dart,hitesh97/angular.dart,winstonewert/angular.dart,trinarytree/angular.dart,winstonewert/angular.dart,hitesh97/angular.dart,ronlobo/angular.dart,ronlobo/angular.dart,winstonewert/angular.dart,SibuStephen/angular.dart,rkirov/angular.dart,rkirov/angular.dart,giovannicandido/angular.dart,SibuStephen/angular.dart,ronlobo/angular.dart,ronlobo/angular.dart,hitesh97/angular.dart,rkirov/angular.dart,trinarytree/angular.dart,trinarytree/angular.dart,rkirov/angular.dart,SibuStephen/angular.dart,SibuStephen/angular.dart,winstonewert/angular.dart,hitesh97/angular.dart