mirror of
https://github.com/atom/atom.git
synced 2026-01-23 05:48:10 -05:00
Conflicts: .pairs package.json spec/app/tokenized-buffer-spec.coffee src/app/edit-session.coffee src/app/project.coffee src/app/window.coffee src/atom-application.coffee static/root-view.less
13 lines
487 B
Plaintext
13 lines
487 B
Plaintext
[submodule "vendor/bootstrap"]
|
|
path = vendor/bootstrap
|
|
url = https://github.com/twbs/bootstrap
|
|
[submodule "vendor/apm"]
|
|
path = vendor/apm
|
|
url = https://github.com/github/apm.git
|
|
[submodule "vendor/telepath"]
|
|
path = vendor/telepath
|
|
url = https://github.com/github/telepath.git
|
|
[submodule "src/packages/collaboration/vendor/atom-collaboration-server"]
|
|
path = src/packages/collaboration/vendor/atom-collaboration-server
|
|
url = https://github.com/github/atom-collaboration-server.git
|