fixing minor issues with previous push

This commit is contained in:
Elad Iwanir 2017-08-21 16:07:02 +03:00
Родитель 1d2ec2b757
Коммит 83f04e9a19
3 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -131,7 +131,6 @@ Or
.travis/build.sh
```
<<<<<<< HEAD
# Resources
### Technologies In Use

Просмотреть файл

@ -1,6 +1,6 @@
{
"main.css": "static/css/main.2f893525.css",
"main.css.map": "static/css/main.2f893525.css.map",
"main.js": "static/js/main.d117b2a7.js",
"main.js.map": "static/js/main.d117b2a7.js.map"
"main.css": "static/css/main.43e63d1e.css",
"main.css.map": "static/css/main.43e63d1e.css.map",
"main.js": "static/js/main.8bbc9d4e.js",
"main.js.map": "static/js/main.8bbc9d4e.js.map"
}

Просмотреть файл

@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"/><title>React App</title><link href="/static/css/main.2f893525.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/static/js/main.d117b2a7.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"/><title>React App</title><link href="/static/css/main.43e63d1e.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/static/js/main.8bbc9d4e.js"></script></body></html>