summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-23 21:44:32 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-23 21:44:32 +0900
commit9783e9d81cd933445f7aaff13ff58f2791e401d2 (patch)
treeeb37409c5617722194ad490e1a8fa7db5e3f1232 /tasks
parent07b75ca922cec8a29315978aaf8b58fbec020049 (diff)
parent116f75a8ce9d5d11d41268ecc95863f4e10f2729 (diff)
downloadmruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.tar.gz
mruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.zip
resolve conflict
Diffstat (limited to 'tasks')
-rw-r--r--tasks/mrbgems.rake3
1 files changed, 2 insertions, 1 deletions
diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake
index 5f156c45a..d8f56f88e 100644
--- a/tasks/mrbgems.rake
+++ b/tasks/mrbgems.rake
@@ -74,9 +74,10 @@ please check the following additional licenses too:
GEMS_LEGAL
gems.map do |g|
+ authors = [g.authors].flatten.sort.join(", ")
f.puts
f.puts "GEM: #{g.name}"
- f.puts "Copyright (c) #{Time.now.year} #{g.authors}"
+ f.puts "Copyright (c) #{Time.now.year} #{authors}"
f.puts "License: #{g.licenses}"
end
end