Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 1 insertions, 1 deletions

diff --git a/test/flat.conf.js b/test/flat.conf.js
index cd2dbdcdc..1c9ec3dcd 100644
--- a/test/flat.conf.js
+++ b/test/flat.conf.js
@@ -1,6 +1,6 @@
 const getBaseConfig = require('./base.conf.js')
 
-module.exports = function(config) {
+module.exports = function (config) {
   const settings = getBaseConfig(config)
   settings.files.push('development/bundle.js')
   settings.files.push('test/integration/bundle.js')