From 41fdd5d4c6d52aa723348d4891b88c06a4d46efa Mon Sep 17 00:00:00 2001
From: qdeswaef <quinten.de.swaef@persgroep.be>
Date: Thu, 15 Dec 2016 15:32:08 +0100
Subject: [PATCH] fixes gh-109: resolve conflict between Ownable and ERC20
 token.

---
 contracts/Ownable.sol | 4 ++--
 test/Ownable.js       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol
index 40fc08146..705f081bc 100644
--- a/contracts/Ownable.sol
+++ b/contracts/Ownable.sol
@@ -14,12 +14,12 @@ contract Ownable {
     owner = msg.sender;
   }
 
-  modifier onlyOwner() { 
+  modifier onlyOwner() {
     if (msg.sender == owner)
       _;
   }
 
-  function transfer(address newOwner) onlyOwner {
+  function transferOwnership(address newOwner) onlyOwner {
     if (newOwner != address(0)) owner = newOwner;
   }
 
diff --git a/test/Ownable.js b/test/Ownable.js
index abf8a9272..24a2d239c 100644
--- a/test/Ownable.js
+++ b/test/Ownable.js
@@ -12,7 +12,7 @@ contract('Ownable', function(accounts) {
 
   it("changes owner after transfer", async function() {
     let other = accounts[1];
-    let transfer = await ownable.transfer(other);
+    let transfer = await ownable.transferOwnership(other);
     let owner = await ownable.owner();
 
     assert.isTrue(owner === other);
@@ -20,7 +20,7 @@ contract('Ownable', function(accounts) {
 
   it("should prevent non-owners from transfering", async function() {
     let other = accounts[2];
-    let transfer = await ownable.transfer(other, {from: accounts[2]});
+    let transfer = await ownable.transferOwnership(other, {from: accounts[2]});
     let owner = await ownable.owner();
 
      assert.isFalse(owner === other);
@@ -29,9 +29,9 @@ contract('Ownable', function(accounts) {
   it("should guard ownership against stuck state", async function() {
     let ownable = Ownable.deployed();
     let originalOwner = await ownable.owner();
-    let transfer = await ownable.transfer(null, {from: originalOwner});
+    let transfer = await ownable.transferOwnership(null, {from: originalOwner});
     let newOwner = await ownable.owner();
-    
+
     assert.equal(originalOwner, newOwner);
   });