WS-2016.2.4 <martin@ubuntu Merge branch 'master'
Conflicts: webServers.xml
This commit is contained in:
commit
211e9e61e7
@ -1,5 +1,5 @@
|
||||
<application>
|
||||
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" outerIgnoreWrapperHeight="100" version="1.5" starredTemplates="" settingsFixed="true">
|
||||
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" outerIgnoreWrapperHeight="100" version="1.6" starredTemplates="" unignoreActions="true" settingsFixed="true">
|
||||
<languages>
|
||||
<language id="Bazaar" NEW_FILE="true" ENABLE="true" />
|
||||
<language id="CloudFoundry" NEW_FILE="true" ENABLE="false" />
|
||||
@ -19,6 +19,7 @@
|
||||
<language id="Nodemon" NEW_FILE="true" ENABLE="false" />
|
||||
<language id="Npm" NEW_FILE="true" ENABLE="false" />
|
||||
<language id="Perforce" NEW_FILE="true" ENABLE="true" />
|
||||
<language id="StyleLint" NEW_FILE="true" ENABLE="false" />
|
||||
<language id="Team Foundation" NEW_FILE="true" ENABLE="true" />
|
||||
</languages>
|
||||
<userTemplates>
|
||||
|
34
tfs.xml
Normal file
34
tfs.xml
Normal file
@ -0,0 +1,34 @@
|
||||
<application>
|
||||
<component name="org.jetbrains.tfsIntegration.core.configuration.TFSConfigurationManager">
|
||||
<option name="config">
|
||||
<map>
|
||||
<server uri="http://i-t-v-tf01:8080/tfs/">
|
||||
<value>
|
||||
<configuration>
|
||||
<credentials>
|
||||
<credentials>
|
||||
<domain>AMORGROUP</domain>
|
||||
<password>dffedfcfdfd2dfcbdfd9df84dffcdfcfdfc4dfdfdfd9df84df99df9ddf98</password>
|
||||
<username>martin.donnelly</username>
|
||||
</credentials>
|
||||
</credentials>
|
||||
</configuration>
|
||||
</value>
|
||||
</server>
|
||||
<server uri="http://i-t-v-tf01:8080/tfs/Transport/">
|
||||
<value>
|
||||
<configuration>
|
||||
<credentials>
|
||||
<credentials>
|
||||
<domain>AMORGROUP</domain>
|
||||
<password>dffedfcfdfd2dfcbdfd9df84dffcdfcfdfc4dfdfdfd9df84df99df9ddf98</password>
|
||||
<username>martin.donnelly</username>
|
||||
</credentials>
|
||||
</credentials>
|
||||
</configuration>
|
||||
</value>
|
||||
</server>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
</application>
|
@ -41,6 +41,6 @@
|
||||
</option>
|
||||
</component>
|
||||
<component name="webServersAuthStorage">
|
||||
<data>AAACMOwn5jGG5Wp8jrBHIrB9mWn96+UllyTg8BRSN5P58zfnBEPLDpduBqzU6LVm0lTCIAUqnRVq806vQenxXJ2QXxxKZ/W2Te1TADMWFU70dtTJdGXMu5Bbjg4uUGfvRjn+1ORlKNNFO3dlAcGv/GXInDgnw5KrcdMITlYGBTw8ZCGwI8tJEnneczEeU04dmUUDweByiBfX4VJ+11Rng29jAr0da+CoEvkvXExtor/WLElJpNJMJ/TD/Hc38cDDClcLIglB8xGBwdmpmiXA3rJRDdnuiIXrOnelx2DY1/dYu60dff2qkcL8lCinfZ3HhtbOz3tYrJoGrT9ZsHBAofMv322Yy5FDcO6dQp5eqBb8wA0eMPySnpDGU/GVg8SVTisTW3XAQTQyO8EH4TII2YkaM8KGmqbQUYASLcTQepsT9DamlwVjAIPQPBMaCViVNvIOHx7gktC54Qzx3B5BYWtiCZOzbILK/c36EQ9myP+eLBMOp9CnMtSz23VAYi/fRZCSacw9QGKVx1xr0iecN1Wk8cwR2HNQrstow4jTlen22cmw+rircVjaBb1WlGN8UF8YgqJLw4zHgkW/nvY6QlIYEMOMDczaF7DXDH5w67rrDCsCYEnMd/IVWoBwvn7sgXMTkRyfJUi+dHcD73tVFOlCyFrahck8clazPzpNCgK2fb9VD+V/UMLcdWWtUs8UsC+kr1lJIRmFtGuTIM8+DPaMAQo56R3gQ4yYrzyxcLcbecBLdO70B793GFAGOwlfiY+CEQ==</data>
|
||||
<data>AAACMFYSPPyFAQ48DFoAzUBTcOLostArIyViWMJ2lHud2InQlfmifWnRLkCCvh2V+CTA+jFJtzb78tM/8E4EuDScQ5SzqPyqfQQxCg6RMbecxD8C8RkB31cVABdTQ9+LDDGGLw+gDxjKS7Xr46VTFV2SktQLOrmmatDbNmGctR7XRpFEczKJxnfyPAN4X+h0re+aeDpGyPil4Cjjg9BxmbZUvcljm9ge0HG9SuKCivxc+VMZokdL6L+nB5POTHfjlsInlsDnO0n3AalOj6slalGJkslLWgM2xECYZ0lEzgcnB2uUPWqokWcfp/Ax17811jsCWe6UfUOqld9cxOxJlOnRGQ0r59yKm6q1sEdrGUd6mirg7vtg1TabQmEZWI6Gjrmdm+TvXguj9Nq9XdhKK8JxWDHBvGCoHT707XC3znzp8/1zpcCs394L3rvrV4+CJHtM2xHRiZd7XZc+27pavclDUt4bNqVaP09THGo59IrHnTegcvtDgV6CHbsqHnCM3+1atwJJjybnLL4iSEz8KwtGyyshd/sk2oHV2qDcuUq0uMDrD/gU9p0Kue5DwFE+l6sLkM944bNIha217mGIZ8T2vLsHqW3Ne/JrWh+bPP1EkT8LATV9GoXpMvxWoP5bVcbGEGp+5vb/Ku4lvdgXIfrjTC+iC3Z5MHO8wES4MnXGFq0lASXBpzNwyNyfIRIARXiCeMtrSt2gzUo+o5BykafKuM1LnlpBCeTbz1VJuxAdRbizx2bpfF2Z4YeuFJfhUgcmAg==</data>
|
||||
</component>
|
||||
</application>
|
Loading…
Reference in New Issue
Block a user