Fix rebase conflicts, by delete shifter instance
authorArunima DIvya <adivya822@student.fuhsd.org>
Tue, 31 Jan 2017 03:20:45 +0000 (19:20 -0800)
committerArunima DIvya <adivya822@student.fuhsd.org>
Fri, 3 Feb 2017 03:23:38 +0000 (19:23 -0800)

No differences found