fixed version conflicts

.travis.yml

@@ -14,4 +14,4 @@ before_script:
 script: phpunit
 
 notifications:
-    webhooks: http://sonata-project.org/bundles/admin/2-0/travis
+    webhooks: http://sonata-project.org/bundles/admin/master/travis

Resources/doc/reference/installation.rst

@@ -27,7 +27,7 @@ in your ``deps`` file:
   [SonataAdminBundle]
       git=git://github.com/sonata-project/SonataAdminBundle.git
       target=/bundles/Sonata/AdminBundle
-      version=origin/2.0
+      version=origin/master
 
   [SonataBlockBundle]
       git=git://github.com/sonata-project/SonataBlockBundle.git
@@ -100,4 +100,4 @@ Usually when installing new bundles a good practice is also to delete your cache
 After you have successfully installed above bundles you need to configure
 SonataAdminBundle for administering your models. All that is needed to quickly
 set up SonataAdminBundle is described in the next chapter the Getting started
-with SonataAdminBundle.
+with SonataAdminBundle.

Resources/translations/SonataAdminBundle.nl.xliff

@@ -352,13 +352,10 @@
             <trans-unit id="label_export_download">
                 <source>label_export_download</source>
                 <target>Download : </target>
-<<<<<<< HEAD
-=======
             </trans-unit>
             <trans-unit id="loading_information">
                 <source>loading_information</source>
                 <target>Laden van informatie…</target>
->>>>>>> 2.0
             </trans-unit>
         </body>
     </file>