Skip to content

Commit

Permalink
Merge pull request technomancy#2175 from vredniy/master
Browse files Browse the repository at this point in the history
tocontrol -> to control in LICENSE files
  • Loading branch information
winks authored Jul 22, 2016
2 parents 41febc3 + 680f5f0 commit 01c4518
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ obligations in this section do not apply to any claims or Losses
relating to any actual or alleged intellectual property
infringement. In order to qualify, an Indemnified Contributor must: a)
promptly notify the Commercial Contributor in writing of such claim,
and b) allow the Commercial Contributor tocontrol, and cooperate with
and b) allow the Commercial Contributor to control, and cooperate with
the Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such
claim at its own expense.
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/app/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ a commercial product offering. The obligations in this section do not apply
to any claims or Losses relating to any actual or alleged intellectual
property infringement. In order to qualify, an Indemnified Contributor must:
a) promptly notify the Commercial Contributor in writing of such claim, and
b) allow the Commercial Contributor tocontrol, and cooperate with the
b) allow the Commercial Contributor to control, and cooperate with the
Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such claim
at its own expense.
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/default/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ a commercial product offering. The obligations in this section do not apply
to any claims or Losses relating to any actual or alleged intellectual
property infringement. In order to qualify, an Indemnified Contributor must:
a) promptly notify the Commercial Contributor in writing of such claim, and
b) allow the Commercial Contributor tocontrol, and cooperate with the
b) allow the Commercial Contributor to control, and cooperate with the
Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such claim
at its own expense.
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/plugin/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ a commercial product offering. The obligations in this section do not apply
to any claims or Losses relating to any actual or alleged intellectual
property infringement. In order to qualify, an Indemnified Contributor must:
a) promptly notify the Commercial Contributor in writing of such claim, and
b) allow the Commercial Contributor tocontrol, and cooperate with the
b) allow the Commercial Contributor to control, and cooperate with the
Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such claim
at its own expense.
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/template/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ a commercial product offering. The obligations in this section do not apply
to any claims or Losses relating to any actual or alleged intellectual
property infringement. In order to qualify, an Indemnified Contributor must:
a) promptly notify the Commercial Contributor in writing of such claim, and
b) allow the Commercial Contributor tocontrol, and cooperate with the
b) allow the Commercial Contributor to control, and cooperate with the
Commercial Contributor in, the defense and any related settlement
negotiations. The Indemnified Contributor may participate in any such claim
at its own expense.
Expand Down

0 comments on commit 01c4518

Please sign in to comment.