Removed conflict indicator (left in previous commit)

2006-02-17 14:54:16 +00:00 · 2006-02-17 14:54:16 +00:00 · af2b0819eb
parent f659abd416
commit af2b0819eb
1 changed files with 0 additions and 1 deletions
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@ -193,7 +193,6 @@ int add_udn(int,Evt_Udn_Info_t **);

 #endif /* ADMS */

->>>>>>> 1.27
 #endif /* CIDER */
 /*Make this dynamic for later attempt to make all devices dynamic*/
 SPICEdev **DEVices=NULL;