Skip to content

Commit

Permalink
Merge pull request cakephp#3980 from tsmsogn/master
Browse files Browse the repository at this point in the history
[ja] Fix typos
  • Loading branch information
okinaka committed May 23, 2016
2 parents 614779e + f5f6156 commit 1fd6a7a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ja/models/retrieving-your-data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ GROUP BY は? ::
WHERE
((`Company`.`name` = 'Future Holdings')
OR
(`Company`.`name` = 'Steel Mega Works'))
(`Company`.`city` = 'CA'))
AND
((`Company`.`status` = 'active')
OR (NOT (`Company`.`status` IN ('inactive', 'suspended'))))
Expand Down

0 comments on commit 1fd6a7a

Please sign in to comment.