Clean Up

Removed conflict files
2016-07-12 21:27:35 +08:00
parent a613b8e9f0
commit 457fec8a9d
41 changed files with 37 additions and 944 deletions
@@ -14,7 +14,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>/QUpZ520eCLB8jSOWn5cWT1LLqw=</dsig:DigestValue>
+        <dsig:DigestValue>FBp3GJw6431bPYyCfW+sXfuh/jY=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>