remove merge error

Author: gnzlbg

.travis.yml

@@ -44,10 +44,6 @@ matrix:
       - rustup component add rustfmt-preview
       script:
       - cargo fmt --all -- --write-mode=diff
-    - env: RUSTFMT=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
-      script: |
-        cargo install rustfmt-nightly --force
-        cargo fmt --all -- --write-mode=diff
     - env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
       script: |
         cargo install clippy