codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 15:48:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator

Browse source 
Conflicts:
	bower.json
This commit is contained in:
Scott Erickson 2014-04-11 12:44:54 -07:00
parent d11b6a5751
commit d4abbd8ab3
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bower.json
View file

@ -38,13 +38,10 @@
"catiline": "~2.9.3",
"d3": "~3.4.4",
"nanoscroller": "~0.8.0",
<<<<<<< HEAD
"jquery.tablesorter": "~2.15.13",
"treema": "~0.0.1",
"bootstrap": "~3.1.1"
=======
"bootstrap": "~3.1.1",
"validated-backbone-mediator": "~0.1.3"
>>>>>>> a07457acacd24719568e5abecff2843f59ec97bb
},
"overrides": {
"backbone": {