Logo
Explore Help
Sign In
ckaczor/azuredatastudio
1
0
Fork 0
You've already forked azuredatastudio
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
1.24.0
azuredatastudio/extensions/merge-conflict
History
ADS Merger 540046ba00 Merge from vscode cfbd1999769f4f08dce29629fb92fdc0fac53829
2020-08-06 07:08:52 +00:00
..
resources/icons
Merge from master
2019-02-21 17:56:04 -08:00
src
Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae
2020-06-19 10:59:23 -07:00
.vscodeignore
Merge from vscode cfbd1999769f4f08dce29629fb92fdc0fac53829
2020-08-06 07:08:52 +00:00
extension-browser.webpack.config.js
Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d
2020-06-30 11:31:11 -07:00
extension.webpack.config.js
Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae
2020-06-19 10:59:23 -07:00
package.json
Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d
2020-06-30 11:31:11 -07:00
package.nls.json
Merge from vscode 10492ba146318412cbee8b76a8c630f226914734
2020-04-08 06:33:38 +00:00
README.md
Merge Azure Data Studio branding changes (#2689)
2018-09-24 15:39:19 -07:00
tsconfig.json
Merge from master
2019-02-21 17:56:04 -08:00
yarn.lock
Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)
2019-12-04 19:28:22 -08:00

README.md

Merge Conflict

Notice: This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.

Features

See Merge Conflicts to learn about features of this extension.

Reference in New Issue View Git Blame Copy Permalink
Powered by Gitea Version: 1.25.4 Page: 281ms Template: 10ms
English
Bahasa Indonesia Deutsch English Español Français Gaeilge Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API