resolved merge conflicts

2016-12-22 23:17:01 -05:00 · 2016-12-22 23:17:01 -05:00 · 71c889982f
commit 71c889982f
parent 45d84f9485 620c81466c
3 changed files with 3 additions and 3 deletions
--- a/schedulers/proactiveclusterwidecappers.go
+++ b/schedulers/proactiveclusterwidecappers.go
@ -1,6 +1,6 @@
 /*
 Cluster wide dynamic capping
-This is not a scheduler but a scheduling scheme that schedulers can use.
+this is not a scheduler but a scheduling scheme that schedulers can use.
 */
 package schedulers