merging built files

Author: formly-bot

dist/formly.js

@@ -1,4 +1,4 @@
-//! angular-formly version 6.26.4 built with ♥ by Astrism <[email protected]>, Kent C. Dodds <[email protected]> (ó ì_í)=óò=(ì_í ò)
+//! angular-formly version 6.26.9 built with ♥ by Astrism <[email protected]>, Kent C. Dodds <[email protected]> (ó ì_í)=óò=(ì_í ò)
 
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -147,7 +147,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	ngModule.constant('formlyApiCheck', _providersFormlyApiCheck2['default']);
 	ngModule.constant('formlyErrorAndWarningsUrlPrefix', _otherDocsBaseUrl2['default']);
-	ngModule.constant('formlyVersion', ("6.26.4")); // <-- webpack variable
+	ngModule.constant('formlyVersion', ("6.26.9")); // <-- webpack variable
 
 	ngModule.provider('formlyUsability', _providersFormlyUsability2['default']);
 	ngModule.provider('formlyConfig', _providersFormlyConfig2['default']);
@@ -452,7 +452,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("6.26.4") + "/other/ERRORS_AND_WARNINGS.md#";
+	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("6.26.9") + "/other/ERRORS_AND_WARNINGS.md#";
 	module.exports = exports["default"];
 
 /***/ },

dist/formly.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-formly",
-  "version": "6.26.4",
+  "version": "6.26.9",
   "author": "Astrism <[email protected]>",
   "contributors": [
     "Astrism <[email protected]>",

dist/formly.min.js.map

@@ -7,6 +7,9 @@ echo "setting global bot config"
 git config --global user.email [email protected]
 git config --global user.name formly-bot
 
+echo "checking out temp branch"
+git checkout -b travis/temp
+
 echo "adding dist"
 git add dist package.json
 
@@ -21,8 +24,8 @@ git remote set-branches --add origin latest # required because travis clones wit
 git fetch origin
 git checkout latest
 
-echo "merging master"
-git merge master -m "master merge" -X theirs
+echo "merging built files"
+git merge travis/temp -m "merging built files" -X theirs
 
 echo "pushing"
 git push origin HEAD:latest -f >/dev/null 2>/dev/null