Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- user@pop-os ~/Рабочий стол/e42-courses master git push
- Username for 'https://github.com': mrgreyves@gmail.com
- Password for 'https://mrgreyves@gmail.com@github.com':
- To https://github.com/express42/e42-courses.git
- ! [rejected] master -> master (fetch first)
- error: не удалось отправить некоторые ссылки в «https://github.com/express42/e42-courses.git»
- подсказка: Обновления были отклонены, так как внешний репозиторий содержит
- подсказка: изменения, которых у вас нет в вашем локальном репозитории.
- подсказка: Обычно, это связанно с тем, что кто-то уже отправил изменения в
- подсказка: то же место. Перед повторной отправкой ваших изменений, вам нужно
- подсказка: забрать и слить изменения из внешнего репозитория себе
- подсказка: (например, с помощью «git pull …»).
- подсказка: Для дополнительной информации, смотрите «Note about fast-forwards»
- подсказка: в «git push --help».
- ✘ user@pop-os ~/Рабочий стол/e42-courses master git pull
- Username for 'https://github.com': mrgreyves@gmail.com
- Password for 'https://mrgreyves@gmail.com@github.com':
- remote: Enumerating objects: 54, done.
- remote: Counting objects: 100% (54/54), done.
- remote: Compressing objects: 100% (32/32), done.
- remote: Total 43 (delta 14), reused 38 (delta 11), pack-reused 0
- Распаковка объектов: 100% (43/43), готово.
- Из https://github.com/express42/e42-courses
- 56f23a6..1438bff master -> origin/master
- Автослияние css/theme/e42.css
- Автослияние css/font/ProximaNova.css
- Merge made by the 'recursive' strategy.
- assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHl829QP-4KuL2Q.woff2 | Bin 0 -> 4836 bytes
- assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHlU29QP-4KuL2Q.woff2 | Bin 0 -> 6180 bytes
- assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHlg29QP-4KuL2Q.woff2 | Bin 0 -> 3924 bytes
- assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHls29QP-4Ks.woff2 | Bin 0 -> 9272 bytes
- assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs4Yu28qmR9FXh.woff2 | Bin 0 -> 6500 bytes
- assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs64u28qmR9FXh.woff2 | Bin 0 -> 5400 bytes
- assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs74u28qmR9A.woff2 | Bin 0 -> 9868 bytes
- assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs7Iu28qmR9FXh.woff2 | Bin 0 -> 4256 bytes
- assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4C3c7YGx0Kuh9Q.woff2 | Bin 0 -> 3904 bytes
- assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4C7c7YGx0Ks.woff2 | Bin 0 -> 8960 bytes
- assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4CDc7YGx0Kuh9Q.woff2 | Bin 0 -> 6008 bytes
- assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4Crc7YGx0Kuh9Q.woff2 | Bin 0 -> 4872 bytes
- assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G-Qn5wqm72JOY.woff2 | Bin 0 -> 6576 bytes
- assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G8wn5wqm72JOY.woff2 | Bin 0 -> 5248 bytes
- assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G9An5wqm72JOY.woff2 | Bin 0 -> 4228 bytes
- assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G9wn5wqm72A.woff2 | Bin 0 -> 10128 bytes
- css/font/AnonymousPro.css | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- assets/font/proxima-nova/stylesheet.css => css/font/ProximaNova.css | 85 +++++++++++++++++++++++++-------------------------
- {assets => css}/theme/e42.css | 8 +++--
- reveal-md.json | 2 +-
- slides/common/Kubernetes/kubernetes-affinity.md | 2 +-
- 21 files changed, 193 insertions(+), 48 deletions(-)
- create mode 100644 assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHl829QP-4KuL2Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHlU29QP-4KuL2Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHlg29QP-4KuL2Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2Bp2a15UIB7Un-bOeISG3pHls29QP-4Ks.woff2
- create mode 100644 assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs4Yu28qmR9FXh.woff2
- create mode 100644 assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs64u28qmR9FXh.woff2
- create mode 100644 assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs74u28qmR9A.woff2
- create mode 100644 assets/font/anonymous-pro/rP2ap2a15UIB7Un-bOeISG3pHl4OTCzs7Iu28qmR9FXh.woff2
- create mode 100644 assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4C3c7YGx0Kuh9Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4C7c7YGx0Ks.woff2
- create mode 100644 assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4CDc7YGx0Kuh9Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2cp2a15UIB7Un-bOeISG3pFuAT4Crc7YGx0Kuh9Q.woff2
- create mode 100644 assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G-Qn5wqm72JOY.woff2
- create mode 100644 assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G8wn5wqm72JOY.woff2
- create mode 100644 assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G9An5wqm72JOY.woff2
- create mode 100644 assets/font/anonymous-pro/rP2fp2a15UIB7Un-bOeISG3pHl4G9wn5wqm72A.woff2
- create mode 100644 css/font/AnonymousPro.css
- rename assets/font/proxima-nova/stylesheet.css => css/font/ProximaNova.css (51%)
- rename {assets => css}/theme/e42.css (96%)
- user@pop-os ~/Рабочий стол/e42-courses master git push
- Username for 'https://github.com': mrgreyves@gmail.com
- Password for 'https://mrgreyves@gmail.com@github.com':
- Подсчет объектов: 16, готово.
- Delta compression using up to 8 threads.
- Сжатие объектов: 100% (15/15), готово.
- Запись объектов: 100% (16/16), 73.56 KiB | 2.54 MiB/s, готово.
- Total 16 (delta 9), reused 0 (delta 0)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement