summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorTai Vuong <tvuong@audiokinetic.com>2017-10-30 15:18:33 -0400
committerTai Vuong <tvuong@audiokinetic.com>2017-10-30 15:18:33 -0400
commitc46955de2731563d1991691cd1a7986f05f019e3 (patch)
treee0375428c2c9ad60bbfb8cc7f53f157770232ea6 /README.md
parent53aea8f073c5b4ad859c39f903fdbcaccd2fc5b8 (diff)
parent8a584f01b46d251fdc5de8b071eff755d99f0090 (diff)
isolate structure use in policy util from HLB
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/README.md b/README.md
index 4c09ecc..3a940b3 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,10 @@
```
# Initial clone with submodules
git clone https://github.com/Audiokinetic-Automotive/afb-audiohighlevel.git
+<<<<<<< HEAD
cd afb-audiohighlevel
+=======
+>>>>>>> 8a584f01b46d251fdc5de8b071eff755d99f0090
```