~etalab/code.gouv.fr

0dd51bb5d726a941fdae7f786c059d0d80ebc5e9 — Bastien Guerry a month ago 7f9f6ba
fixup! Merge branch 'preproduction' into production
1 files changed, 0 insertions(+), 4 deletions(-)

M .builds/production.yml
M .builds/production.yml => .builds/production.yml +0 -4
@@ 13,11 13,7 @@ tasks:
      sudo ./linux-install-1.10.3.998.sh
  - build: |
      cd code.gouv.fr
<<<<<<< HEAD:.builds/production.yml
      git checkout production
=======
      git checkout preproduction
>>>>>>> preproduction:.builds/preproduction.yml
      clojure -M:js
  - upload: |
      cd code.gouv.fr/resources/public/