Merge cnflict fix

2016-07-02 12:36:39 +03:00 · 2016-07-02 12:36:39 +03:00 · 34cf005593
--- a/app/src/main/res/raw/bootstrap_data.json
+++ b/app/src/main/res/raw/bootstrap_data.json
@ -296,4 +296,4 @@
      "optionc": "Hewlet Pakard",
      "optiond": "Digital Skills Observatory"
    }]
-}
+}