servo: Merge #17233 - Remove file accidentally added in #17219 (from emilio:rej); r=bzbarsky

And prevent it from happening again.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2a78fae6014e55d5efa1280fdb2e717eaa9148f6

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 3dbca60d73b213f141463703c90827ce29174978

servo/.gitignore

@@ -14,6 +14,8 @@
 *.swp
 *.swo
 *.csv
+*.rej
+*.orig
 .DS_Store
 Servo.app
 .config.mk.last

servo/components/style/values/specified/mod.rs.rej

@@ -1,44 +0,0 @@
---- components/style/values/specified/mod.rs
-+++ components/style/values/specified/mod.rs
-@@ -4,40 +4,38 @@
- 
- //! Specified values.
- //!
- //! TODO(emilio): Enhance docs.
- 
- use Namespace;
- use context::QuirksMode;
- use cssparser::{self, Parser, Token, serialize_identifier};
--use itoa;
- use parser::{ParserContext, Parse};
- use self::grid::TrackSizeOrRepeat;
- use self::url::SpecifiedUrl;
- use std::ascii::AsciiExt;
- use std::f32;
- use std::fmt;
--use std::io::Write;
- use style_traits::ToCss;
- use style_traits::values::specified::AllowedNumericType;
- use super::{Auto, CSSFloat, CSSInteger, Either, None_};
- use super::computed::{self, Context};
- use super::computed::{Shadow as ComputedShadow, ToComputedValue};
- use super::generics::grid::{TrackBreadth as GenericTrackBreadth, TrackSize as GenericTrackSize};
- use super::generics::grid::TrackList as GenericTrackList;
- use values::computed::ComputedValueAsSpecified;
- use values::specified::calc::CalcNode;
- 
- #[cfg(feature = "gecko")]
- pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems};
- pub use self::background::BackgroundSize;
- pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth};
- pub use self::border::{BorderImageSideWidth, BorderRadius, BorderSideWidth};
--pub use self::color::Color;
-+pub use self::color::{CSSColor, Color};
- pub use self::rect::LengthOrNumberRect;
- pub use super::generics::grid::GridLine;
- pub use self::image::{ColorStop, EndingShape as GradientEndingShape, Gradient};
- pub use self::image::{GradientItem, GradientKind, Image, ImageRect, ImageLayer};
- pub use self::length::AbsoluteLength;
- pub use self::length::{FontRelativeLength, ViewportPercentageLength, CharacterWidth, Length, CalcLengthOrPercentage};
- pub use self::length::{Percentage, LengthOrNone, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto};
- pub use self::length::{LengthOrPercentageOrNone, LengthOrPercentageOrAutoOrContent, NoCalcLength};