test

[postgresql/dblt] / .gitignore

diff --git a/.gitignore b/.gitignore
index bdc3535f745bc86966fb24c67d252c3ea68e8e03..decdda89abefc84ad2eddbceee7f992d8f0ecd52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+.DS_Store
+Thumb.db
+=======
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/
@@ -106,3 +110,4 @@ Generated_Code #added for RIA/Silverlight projects
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
+>>>>>>> fde9f7ab6009e48ed05936471f4553afa32adf7e