From 229385955109b866a23c4ac2aa03d4d11044c39d Mon Sep 17 00:00:00 2001
From: "Enrico Loparco (eloparco)" <eloparco@cisco.com>
Date: Thu, 24 Jun 2021 09:15:41 +0200
Subject: [HICN-708] Rebase with master

Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 869c74668..79be94a51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 build*
 .ccls-cache/
 compile_commands.json
-.vscode
\ No newline at end of file
+.vscode
+.DS_Store
\ No newline at end of file
-- 
cgit 1.2.3-korg