Download as
Browse Code »

Commit b20dad3a47afe46d817494f5aaa664c9a9347ddb

Authored by Julian Cesar dos Santos
1 parent 63d4356a

Fix parent pom

Showing 1 changed file with 0 additions and 16 deletions   Show diff stats
demoiselle-parent/pom.xml
  Diff comments   View file @b20dad3
... ... @@ -175,41 +175,25 @@
175 175 <dependency>
176 176 <groupId>org.demoiselle.jee</groupId>
177 177 <artifactId>demoiselle-core</artifactId>
178   -<<<<<<< HEAD
179   - <version>${version}</version>
180   -=======
181 178 <version>3.0.0-BETA1-SNAPSHOT</version>
182   ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
183 179 </dependency>
184 180  
185 181 <dependency>
186 182 <groupId>org.demoiselle.jee</groupId>
187 183 <artifactId>demoiselle-security</artifactId>
188   -<<<<<<< HEAD
189 184 <version>${demoiselle.version}</version>
190   -=======
191   - <version>3.0.0-BETA1-SNAPSHOT</version>
192   ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
193 185 </dependency>
194 186  
195 187 <dependency>
196 188 <groupId>org.demoiselle.jee</groupId>
197 189 <artifactId>demoiselle-rest</artifactId>
198   -<<<<<<< HEAD
199 190 <version>${demoiselle.version}</version>
200   -=======
201   - <version>3.0.0-BETA1-SNAPSHOT</version>
202   ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
203 191 </dependency>
204 192  
205 193 <dependency>
206 194 <groupId>org.demoiselle.jee</groupId>
207 195 <artifactId>demoiselle-persistence-jpa</artifactId>
208   -<<<<<<< HEAD
209 196 <version>${demoiselle.version}</version>
210   -=======
211   - <version>3.0.0-BETA1-SNAPSHOT</version>
212   ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
213 197 </dependency>
214 198  
215 199 </dependencies>
... ...