Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reemplazado atributo en materia por annotation en carrera #113

Merged
merged 2 commits into from
Nov 26, 2018

Conversation

faloi
Copy link
Contributor

@faloi faloi commented Nov 25, 2018

References #112

Lo que hicimos la semana pasada en la clase. Fíjense que cargué una issue, habría que terminar esto y asentar los criterios en la wiki.

Como aún falta trabajo para cerrar la issue (que creé recién), le puse References y no Closes.

@ghost ghost assigned faloi Nov 25, 2018
@ghost ghost added the review label Nov 25, 2018
@fede9612
Copy link
Contributor

@faloi hay que resolver conflictos

…tal into 112-criterios-persistencia

# Conflicts:
#	src/main/java/ar/edu/unq/sarmiento/hibernate/DataGenerator.java
@faloi faloi force-pushed the 112-criterios-persistencia branch from ec7ced4 to 1276740 Compare November 26, 2018 01:57
@fede9612 fede9612 merged commit 14cfbae into master Nov 26, 2018
@ghost ghost removed the review label Nov 26, 2018
@fede9612 fede9612 deleted the 112-criterios-persistencia branch November 26, 2018 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants