Merge pull request #109 from robertqin86/master

Fix: Execution failed for task :app:mergeReleaseResources for Android release

Author: palingheorghe

src/Icon.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 import GalioTheme, { withGalio } from './theme';
 import getIconType from './helpers/getIconType';
-import galioConfig from './fonts/galio.json';
+import galioConfig from './config/galio.json';
 
 const Galio = createIconSetFromIcoMoon(galioConfig, 'Galio', './fonts/galio.ttf');
 

src/fonts/galio.json renamed to src/config/galio.json

@@ -11,10 +11,10 @@ import Switch from './Switch';
 import Text from './Text';
 import theme, { withGalio, GalioProvider } from './theme';
 
-import galioConfig from './fonts/galio.json';
+import galioConfig from './config/galio.json';
 const GalioFont = require('./fonts/galio.ttf');
 
-export { 
+export {
   Block,
   Button,
   Card,