Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb
Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb

mmkassem/gitlabhq,iiet/iiet-git,iiet/iiet-git,iiet/iiet-git,mmkassem/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,iiet/iiet-git,stoplightio/gitlabhq,stoplightio/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq