##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r1030:158ce501 default
r5546:50cf7822 merge v5.2.0 stable
Show More
diff_match_patch_license.txt
14 lines | 600 B | text/plain | TextLexer
/ licenses / diff_match_patch_license.txt
dan
diffs: replace compare controller with new html based diffs:...
r1030 Copyright 2006 Google Inc.
http://code.google.com/p/google-diff-match-patch/
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.