Merge pull request #24 from daostack/gh-issue-23

VotingMachines -> votingMachines
daostack · Oct 11, 2018 · 2113539 · 2113539
2 parents 1c3aaad + 9c35aea
commit 2113539
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/contracts/test/AbsoluteVoteExecuteMock.sol b/contracts/test/AbsoluteVoteExecuteMock.sol
@@ -1,11 +1,11 @@
 pragma solidity ^0.4.25;
 
-import "../VotingMachines/ProposalExecuteInterface.sol";
-import "../VotingMachines/VotingMachineCallbacksInterface.sol";
+import "../votingMachines/ProposalExecuteInterface.sol";
+import "../votingMachines/VotingMachineCallbacksInterface.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "./Debug.sol";
 import "../Reputation.sol";
-import "../VotingMachines/AbsoluteVote.sol";
+import "../votingMachines/AbsoluteVote.sol";
 
 
 contract AbsoluteVoteExecuteMock is Debug,VotingMachineCallbacksInterface,ProposalExecuteInterface,Ownable {

diff --git a/contracts/test/GenesisProtocolCallbacksMock.sol b/contracts/test/GenesisProtocolCallbacksMock.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.25;
 
-import "../VotingMachines/VotingMachineCallbacksInterface.sol";
-import "../VotingMachines/ProposalExecuteInterface.sol";
-import "../VotingMachines/GenesisProtocol.sol";
+import "../votingMachines/VotingMachineCallbacksInterface.sol";
+import "../votingMachines/ProposalExecuteInterface.sol";
+import "../votingMachines/GenesisProtocol.sol";
 import "../Reputation.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "./Debug.sol";

diff --git a/contracts/VotingMachines/AbsoluteVote.sol → contracts/votingMachines/AbsoluteVote.sol b/contracts/VotingMachines/AbsoluteVote.sol → contracts/votingMachines/AbsoluteVote.sol
diff --git a/contracts/VotingMachines/GenesisProtocol.sol → contracts/votingMachines/GenesisProtocol.sol b/contracts/VotingMachines/GenesisProtocol.sol → contracts/votingMachines/GenesisProtocol.sol
diff --git a/...racts/VotingMachines/IntVoteInterface.sol → ...racts/votingMachines/IntVoteInterface.sol b/...racts/VotingMachines/IntVoteInterface.sol → ...racts/votingMachines/IntVoteInterface.sol
diff --git a/...tingMachines/ProposalExecuteInterface.sol → ...tingMachines/ProposalExecuteInterface.sol b/...tingMachines/ProposalExecuteInterface.sol → ...tingMachines/ProposalExecuteInterface.sol
diff --git a/contracts/VotingMachines/QuorumVote.sol → contracts/votingMachines/QuorumVote.sol b/contracts/VotingMachines/QuorumVote.sol → contracts/votingMachines/QuorumVote.sol
diff --git a/...hines/VotingMachineCallbacksInterface.sol → ...hines/VotingMachineCallbacksInterface.sol b/...hines/VotingMachineCallbacksInterface.sol → ...hines/VotingMachineCallbacksInterface.sol
diff --git a/package-lock.json b/package-lock.json