Tom Underhill 5373fb02f1 Resolved more merge conflicts.		2020-04-30 20:33:02 -07:00
..
__tests__	…
android	Resolved more merge conflicts.	2020-04-30 20:33:02 -07:00
ios	Resolved more merge conflicts.	2020-04-30 20:33:02 -07:00
App.js	Merge react-native 0.61-stable (#323)	2020-04-28 11:49:15 -07:00
_buckconfig	…
_eslintrc.js	Add .eslintrc to RN project template (#23901)	2019-03-21 07:14:23 -07:00
_flowconfig	Resolved more merge conflicts.	2020-04-30 20:33:02 -07:00
_gitattributes	…
_gitignore	Merge react-native 0.61-stable (#323)	2020-04-28 11:49:15 -07:00
_prettierrc.js	Merge react-native 0.61-stable (#323)	2020-04-28 11:49:15 -07:00
_watchmanconfig	…
app.json	…
babel.config.js	…
index.js	…
metro.config.js	…
package.json	Resolved more merge conflicts.	2020-04-30 20:33:02 -07:00