Skip to content

Commit

Permalink
Merge pull request mui#1920 from oliviertassinari/duplcate-proptypes
Browse files Browse the repository at this point in the history
[ClockHours] Remove duplicate PropTypes
  • Loading branch information
oliviertassinari committed Oct 19, 2015
2 parents 5f83108 + b506c88 commit dee31e5
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/time-picker/clock-hours.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ const ClockHours = React.createClass({
muiTheme: React.PropTypes.object,
},

propTypes: {
position: React.PropTypes.oneOf(['left', 'right']),
},

//for passing default theme context to children
childContextTypes: {
muiTheme: React.PropTypes.object,
Expand All @@ -61,6 +57,7 @@ const ClockHours = React.createClass({
},

propTypes: {
position: React.PropTypes.oneOf(['left', 'right']),
initialHours: React.PropTypes.number,
onChange: React.PropTypes.func,
format: React.PropTypes.oneOf(['ampm', '24hr']),
Expand Down

0 comments on commit dee31e5

Please sign in to comment.