typo

Merge branch 'master' of github.com:dlab-berkeley/MachineLearningWG # Conflicts: # Fall2017/Fall2017info
dlab-berkeley · Jan 17, 2018 · 7af3c86 · 7af3c86
2 parents bd404c8 + be43f7c
commit 7af3c86
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Fall2017/Fall2017info b/Fall2017/Fall2017info
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 Machine Learning Working Group Fall 2017
+=======
+chine Learning Working Group Fall 2017
+>>>>>>> be43f7c9e9d51ef2be389593feef6874b136e59b
 
 This semester's topic is neural networks for image processing!