[DRE-commits] [sup-mail] 05/06: Fix merge conflicts from upstream import

[Per Andersson]

This is an automated email from the git hooks/post-receive script.

avtobiff pushed a commit to branch master
in repository sup-mail.

commit 2514132a4df34ac0ef818a9f86abf7198640d493
Author: Per Andersson <avtobiff at gmail.com>
Date:   Tue Oct 7 12:27:29 2014 +0200

    Fix merge conflicts from upstream import
---
 .travis.yml  | 12 ------------
 CONTRIBUTORS |  4 ----
 Rakefile     |  1 -
 3 files changed, 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c9b3cda..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2
-
-script: bundle exec rake travis
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bf78c12..c487152 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -20,7 +20,6 @@ Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Clint Byrum <clint at the ubuntu dot coms>
 Wael M. Nasreddine <wael.nasreddine at the gmail dot coms>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
-Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Lionel Ott <white.magic at the gmx dot des>
 Gaudenz Steinlin <gaudenz at the soziologie dot chs>
 Ingmar Vanhassel <ingmar at the exherbo dot orgs>
@@ -47,7 +46,6 @@ Adeodato Simó <dato at the net.com.org dot ess>
 Daniel Schoepe <daniel.schoepe at the googlemail dot coms>
 James Taylor <james at the jamestaylor dot orgs>
 Jason Petsod <jason at the petsod dot orgs>
-Robin Burchell <viroteck at the viroteck dot nets>
 Steve Goldman <sgoldman at the tower-research dot coms>
 Robin Burchell <viroteck at the viroteck dot nets>
 Peter Harkins <ph at the malaprop dot orgs>
@@ -72,8 +70,6 @@ Steven Lawrance <stl at the koffein dot nets>
 Jonah <Jonah at the GoodCoffee dot cas>
 ian <itaylor at the uark dot edus>
 Adam Lloyd <adam at the alloy-d dot nets>
-MichaelRevell <mikearevell at the gmail dot coms>
-Gregor Hoffleit <gregor at the sam.mediasupervision dot des>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
 0xACE <0xACE at the users.noreply.github dot coms>
 MichaelRevell <mikearevell at the gmail dot coms>
diff --git a/Rakefile b/Rakefile
index 129c335..a565e67 100644
--- a/Rakefile
+++ b/Rakefile
@@ -44,7 +44,6 @@ task :man do
     end
   end
 end
-task :default => :test
 
 task :clean do
   ['man', 'pkg'].each do |d|

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/sup-mail.git