Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Экзаменационное задание #20

Open
wants to merge 28 commits into
base: master
Choose a base branch
from

Conversation

egor-a-trubnikov-panov
Copy link

Запушить запушил. про pull request забыл

@maxvipon
Copy link

Егор, удали из репозитория и добавь в gitignore папку node_modules и пр., что устанавливаются со стороны. Сейчас пулл-реквест нечитаем.

@bratva
Copy link

bratva commented Dec 22, 2013

Егор, верно понимаем - что js-часть ты не делал (переключение персонажей, правый блок, ...)?

Conflicts:
	WebApp/.bem/cache/desktop.blocks/files.json
	WebApp/.bem/cache/desktop.bundles/files.json
	WebApp/.bem/cache/desktop.bundles/index/index.bemhtml.js~bemhtml.meta.js
	WebApp/.bem/cache/desktop.bundles/index/index.css~css.meta.js
	WebApp/.bem/cache/desktop.bundles/index/index.js~browser.js+bemhtml.meta.js
	WebApp/desktop.bundles/index/index.html
	WebApp/desktop.bundles/index/index.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants