Skip to content

Commit b719231

Browse files
carimuracarimura
committed
resolve conflict
2 parents f5556ef + f4c594f commit b719231

File tree

68 files changed

+1012
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1012
-12
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ WORKDIR /app
33

44
COPY ["package.json", "./"]
55
COPY ["gulpfile.js", "./"]
6-
COPY ["app", "./app"]
76

87
RUN npm install gulp -g
98
RUN npm install
9+
10+
COPY ["app", "./app"]
11+
1012
RUN gulp build
1113

12-
CMD ["gulp", "serve"]
14+
CMD ["gulp", "serve"]

‎README.md‎

Lines changed: 6 additions & 4 deletions

‎app/assets/images/eclipse/breakpoint.png‎

23.8 KB

‎app/assets/images/eclipse/compilation_error.png‎

50.5 KB

‎app/assets/images/eclipse/console_output.png‎

39.1 KB

‎app/assets/images/eclipse/content_assist_main.png‎

112 KB

‎app/assets/images/eclipse/content_assist_suggest_class.png‎

153 KB

‎app/assets/images/eclipse/content_assist_suggest_method.png‎

95.9 KB

‎app/assets/images/eclipse/content_assist_sysout.png‎

46.1 KB

‎app/assets/images/eclipse/context_generate_getters_setters.png‎

186 KB

0 commit comments

Comments
 (0)