the-social-notebook-android/.idea/libraries/android_android_23.xml

<component name="libraryTable">
  <library name="android-android-23">
    <CLASSES>
      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-23/android.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
  </library>
</component>
Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android # Conflicts: # .idea/libraries/animated_vector_drawable_23_3_0.xml # .idea/libraries/appcompat_v7_23_3_0.xml # .idea/libraries/design_23_3_0.xml # .idea/libraries/recyclerview_v7_23_3_0.xml # .idea/libraries/support_annotations_23_4_0.xml # .idea/libraries/support_v4_23_3_0.xml # .idea/libraries/support_vector_drawable_23_3_0.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml 2016-07-04 20:11:10 +00:00			`<component name="libraryTable">`
			`<library name="android-android-23">`
			`<CLASSES>`
			`<root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-23/android.jar!/" />`
			`</CLASSES>`
			`<JAVADOC />`
			`<SOURCES />`
			`</library>`
			`</component>`