Browse Source

Merge remote-tracking branch 'KFB/master'

waldek 5 years ago
parent
commit
9ae3506014
4 changed files with 20 additions and 1 deletions
  1. 1
    1
      androidStudioFirstRun.xml
  2. 5
    0
      baseRefactoring.xml
  3. 5
    0
      editor.xml
  4. 9
    0
      vcs.xml

+ 1
- 1
androidStudioFirstRun.xml View File

1
 <application>
1
 <application>
2
   <component name="whatsNew">
2
   <component name="whatsNew">
3
-    <shownVersion>3.6.1</shownVersion>
3
+    <shownVersion>3.6.3</shownVersion>
4
   </component>
4
   </component>
5
 </application>
5
 </application>

+ 5
- 0
baseRefactoring.xml View File

1
+<application>
2
+  <component name="RefactoringSettings">
3
+    <option name="MOVE_PREVIEW_USAGES" value="false" />
4
+  </component>
5
+</application>

+ 5
- 0
editor.xml View File

1
+<application>
2
+  <component name="EditorSettings">
3
+    <option name="USE_SOFT_WRAPS" value="" />
4
+  </component>
5
+</application>

+ 9
- 0
vcs.xml View File

6
           <option name="url" value="http://51.83.130.248:3000" />
6
           <option name="url" value="http://51.83.130.248:3000" />
7
           <option name="userName" value="waldek" />
7
           <option name="userName" value="waldek" />
8
         </UrlAndUserName>
8
         </UrlAndUserName>
9
+        <UrlAndUserName>
10
+          <option name="url" value="https://kfb-acoustics-sp-z-oo.git.beanstalkapp.com/hs_hcg_k.git" />
11
+          <option name="userName" value="" />
12
+        </UrlAndUserName>
13
+        <UrlAndUserName>
14
+          <option name="url" value="http://kfb-acoustics-sp-z-oo.git.beanstalkapp.com" />
15
+          <option name="userName" value="waldek" />
16
+        </UrlAndUserName>
9
       </list>
17
       </list>
10
     </option>
18
     </option>
19
+    <option name="cloneParentDir" value="C:\Users\waldemar.kruszka\Downloads" />
11
   </component>
20
   </component>
12
   <component name="Vcs.Log.App.Settings">
21
   <component name="Vcs.Log.App.Settings">
13
     <option name="COLUMN_ORDER">
22
     <option name="COLUMN_ORDER">