From 6c0a82f48ce57881a69f832742685263a71c2328 Mon Sep 17 00:00:00 2001
From: kimsanghoon1 <sanghoon01@uengine.org>
Date: Tue, 10 Sep 2019 10:48:21 +0900
Subject: [PATCH] application

---
 src/main/java/com/example/template/Application.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/com/example/template/Application.java b/src/main/java/com/example/template/Application.java
index 24a2d3d..cfe23b3 100644
--- a/src/main/java/com/example/template/Application.java
+++ b/src/main/java/com/example/template/Application.java
@@ -26,11 +26,8 @@ public class Application {
             product.setName(p);
             product.setPrice(i*10000);
             product.setStock(i*10);
-<<<<<<< HEAD
-=======
             product.setImageUrl("/goods/img/"+p+".jpg");
 //            product.setImageUrl("https://github.githubassets.com/images/modules/profile/profile-joined-github.png");
->>>>>>> 3cacf53fd2411f3f08694619bc7673b3d4e16af7
             i++;
             productRepository.save(product);
         }