Remove merge feature branch to develop

Author: ggeop

.travis.yml

@@ -47,9 +47,9 @@ stages:
  - name: test
  if: branch!=master AND branch!=develop AND branch!=^untagged.*
  - name: merge (develop --> master)
- if: branch=develop AND type!=pull_request
+ if: branch==develop AND type!=pull_request
  - name: deploy
- if: branch=master
+ if: branch==master
 
 notifications:
  email: false