Permalink
Browse files

Remove conflict markers in previous commit

  • Loading branch information...
1 parent 6d79989 commit 0e92296878e7d584eafd70a417acc7c727d83ed4 Francis Upton IV committed Feb 14, 2012
Showing with 5 additions and 9 deletions.
  1. +0 −6 .gitignore
  2. +5 −0 pom.xml
  3. +0 −3 src/main/java/hudson/plugins/ec2/PluginImpl.java
View
@@ -4,14 +4,8 @@
target
.classpath
-
.project
-
-<<<<<<< HEAD
-.settings/org.eclipse.jdt.core.prefs
-=======
.settings
/bin
/work
->>>>>>> 936b1088a15d7ec2bd636f6307f11660f66b7634
View
@@ -41,6 +41,11 @@
<developers>
<developer>
+ <id>kohsuke</id>
+ <name>Kohsuke Kawaguchi</name>
+ <email>kkawaguchi@cloudbees.com</email>
+ </developer>
+ <developer>
<id>francisu</id>
<name>Francis Upton IV</name>
<email>francis@oaklandsoftware.com</email>
@@ -15,11 +15,8 @@
public void start() throws Exception {
// backward compatibility with the legacy class name
Hudson.XSTREAM.alias("hudson.plugins.ec2.EC2Cloud",AmazonEC2Cloud.class);
-<<<<<<< HEAD
-=======
// backward compatibility with the legacy instance type
Hudson.XSTREAM.registerConverter(new InstanceTypeConverter());
->>>>>>> 936b1088a15d7ec2bd636f6307f11660f66b7634
// make sure the converter gets registered by forcing static initializer
AwsRegion.AP_NORTHEAST_1.toString();

0 comments on commit 0e92296

Please sign in to comment.