Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

 .idea/libraries/Maven__log4j_log4j_1_2_16.xml

@@ -1,13 +1,13 @@
<component name="libraryTable">

  <library name="Maven: log4j:log4j:1.2.16">

    <CLASSES>

      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16.jar!/" />

    </CLASSES>

    <JAVADOC>

      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" />

    </JAVADOC>

    <SOURCES>

      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar!/" />

    </SOURCES>

  </library>

<component name="libraryTable">
  <library name="Maven: log4j:log4j:1.2.16">
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar!/" />
    </SOURCES>
  </library>
</component>