Resolving merge conflicts

rotgergabriel · May 29, 2024 · 09aa1a8 · 09aa1a8
2 parents c564bed + a83a9f5
commit 09aa1a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/assets/img/works/evangelina.png b/assets/img/works/evangelina.png
diff --git a/js/db.js b/js/db.js
@@ -84,6 +84,14 @@ export const data = {
         {
             title : 'Projects',
             projects : [
+                {
+                    title: 'Birthday invitation card',
+                    subtitle: 'Personal Project',
+                    description: 'HTML, CSS, JavaScript, Materialize.css, Node.js, NPM',
+                    img: '/assets/img/works/evangelina.png',
+                    github: 'https://github.com/rotgergabriel/tarjetaCumple',
+                    demo: 'https://evangelina.netlify.app/index.html'
+                }, 
                 {
                     title: 'E-Commerce AluraGeek',
                     subtitle: 'Oracle ONE / Alura Latam',