Commits

Martin Meinhold committed 4885c52 Merge with conflicts

Merge branch 'atlassian-johnson-1.1.x' of bitbucket.org:atlassian/atlassian-johnson

Conflicts:
pom.xml

Comments (0)

Files changed (1)

     </ciManagement>
 
     <scm>
-        <connection>scm:git:https://bitbucket.org/atlassian/atlassian-johnson.git</connection>
-        <developerConnection>scm:git:git@bitbucket.org:atlassian/atlassian-johnson.git</developerConnection>
-        <url>https://bitbucket.org/atlassian/atlassian-johnson/overview</url>
+        <connection>scm:git:ssh://git@bitbucket.org/atlassian/atlassian-johnson.git</connection>
+        <developerConnection>scm:git:ssh://git@bitbucket.org/atlassian/atlassian-johnson.git</developerConnection>
+        <url>https://bitbucket.org/atlassian/atlassian-johnson</url>
     </scm>
 
     <modules>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.